1. photon
  2. Commit a6ca632a9c58f7b5ecc1100507a1b8371d7a9ca1
Browse code

VKE patch for kubernetes

Change-Id: I413395c04af0532158958b264c14eaa6ea8b2509
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5244
Reviewed-by: Bo Gan <ganb@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Bo Gan authored on 2018/06/10 18:19:30
Showing 4 changed files
SPECS/kubernetes/k8s-cascade.patch
History View file @ a6ca632
... ... 
@@ -1,7 +1,7 @@
1 
-From 40064b0cbc084faa76f8f2d29f1c3ed8ae693b02 Mon Sep 17 00:00:00 2001
1 
+From 6b4efdbb56d5d4a0521fd0612e770b17f1e8aae2 Mon Sep 17 00:00:00 2001
2 2 
 From: Bo Gan <ganb@vmware.com>
3 
-Date: Fri, 8 Jun 2018 16:29:28 -0700
4 
-Subject: [PATCH] Cascade Kubernetes patches for v1.9.6 (df346df)
3 
+Date: Sun, 10 Jun 2018 02:16:47 -0700
4 
+Subject: [PATCH] Cascade Kubernetes patches for v1.9.6 (d06c534)
5 5
6 6 
 ---
7 7 
  api/swagger-spec/apps_v1alpha1.json                |  21 +
... ... 
@@ -4079,7 +4079,7 @@ index 0000000..b0a6026
4079 4079 
 \ No newline at end of file
4080 4080 
 diff --git a/plugin/pkg/admission/vke/admission.go b/plugin/pkg/admission/vke/admission.go
4081 4081 
 new file mode 100644
4082 
-index 0000000..15cbb85
4082 
+index 0000000..6325ca0
4083 4083 
 --- /dev/null
4084 4084 
 +++ b/plugin/pkg/admission/vke/admission.go
4085 4085 
 @@ -0,0 +1,349 @@
... ... 
@@ -4353,7 +4353,7 @@ index 0000000..15cbb85
4353 4353 
 +	// If it is a Connect or Delete operation, allow it. We restrict access to connect to any pods in the vke-system
4354 4354 
 +	// namespace. Also, DenyEscalatingExec admission controller denies access to connect to any privileged pod in
4355 4355 
 +	// general. So it is OK to allow this.
4356 
-+	if a.GetOperation() == admission.Connect && a.GetOperation() == admission.Delete {
4356 
++	if a.GetOperation() == admission.Connect || a.GetOperation() == admission.Delete {
4357 4357 
 +		return nil
4358 4358 
 +	}
4359 4359 
 +
SPECS/kubernetes/k8s-vke.patch
History View file @ a6ca632
... ... 
@@ -1,7 +1,7 @@
1 
-From e4ee3045ca2827e20374b9f1da439eb400d3366c Mon Sep 17 00:00:00 2001
1 
+From ba75f0a3934a48bfc8be1908c7eefdff3e9b9eaa Mon Sep 17 00:00:00 2001
2 2 
 From: Bo Gan <ganb@vmware.com>
3 
-Date: Fri, 8 Jun 2018 16:15:19 -0700
4 
-Subject: [PATCH] Cascade Kubernetes patches for v1.10.2 (df346df)
3 
+Date: Sun, 10 Jun 2018 02:13:51 -0700
4 
+Subject: [PATCH] Cascade Kubernetes patches for v1.10.2 (d06c534)
5 5
6 6 
 ---
7 7 
  api/swagger-spec/apps_v1alpha1.json                |  21 +
... ... 
@@ -4104,7 +4104,7 @@ index 0000000..b0a6026
4104 4104 
 \ No newline at end of file
4105 4105 
 diff --git a/plugin/pkg/admission/vke/admission.go b/plugin/pkg/admission/vke/admission.go
4106 4106 
 new file mode 100644
4107 
-index 0000000..c1566ae
4107 
+index 0000000..e33d4e9
4108 4108 
 --- /dev/null
4109 4109 
 +++ b/plugin/pkg/admission/vke/admission.go
4110 4110 
 @@ -0,0 +1,349 @@
... ... 
@@ -4378,7 +4378,7 @@ index 0000000..c1566ae
4378 4378 
 +	// If it is a Connect or Delete operation, allow it. We restrict access to connect to any pods in the vke-system
4379 4379 
 +	// namespace. Also, DenyEscalatingExec admission controller denies access to connect to any privileged pod in
4380 4380 
 +	// general. So it is OK to allow this.
4381 
-+	if a.GetOperation() == admission.Connect && a.GetOperation() == admission.Delete {
4381 
++	if a.GetOperation() == admission.Connect || a.GetOperation() == admission.Delete {
4382 4382 
 +		return nil
4383 4383 
 +	}
4384 4384 
 +
SPECS/kubernetes/kubernetes-1.10.spec
History View file @ a6ca632
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Kubernetes cluster management
2 2 
 Name:           kubernetes
3 3 
 Version:        1.10.2
4 
-Release:        5%{?dist}
4 
+Release:        6%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz
7 7 
 Source0:        kubernetes-%{version}.tar.gz
... ... 
@@ -207,6 +207,8 @@ fi
207 207 
 /opt/vmware/kubernetes/windows/amd64/kubectl.exe
208 208
209 209 
 %changelog
210 
+*   Sat Jun 09 2018 Bo Gan <ganb@vmware.com> 1.10.2-6
211 
+-   Update vke patch (d06c534)
210 212 
 *   Fri Jun 08 2018 Bo Gan <ganb@vmware.com> 1.10.2-5
211 213 
 -   Update vke patch (df346df)
212 214 
 *   Sat Jun 02 2018 Bo Gan <ganb@vmware.com> 1.10.2-4
SPECS/kubernetes/kubernetes-1.9.spec
History View file @ a6ca632
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Kubernetes cluster management
2 2 
 Name:           kubernetes
3 3 
 Version:        1.9.6
4 
-Release:        4%{?dist}
4 
+Release:        5%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz
7 7 
 Source0:        kubernetes-v%{version}.tar.gz
... ... 
@@ -185,6 +185,8 @@ fi
185 185 
 %{_bindir}/pause-amd64
186 186
187 187 
 %changelog
188 
+*   Sat Jun 09 2018 Bo Gan <ganb@vmware.com> 1.9.6-5
189 
+-   Update vke patch (d06c534)
188 190 
 *   Fri Jun 08 2018 Bo Gan <ganb@vmware.com> 1.9.6-4
189 191 
 -   Update vke patch (df346df)
190 192 
 *   Sat Jun 02 2018 Bo Gan <ganb@vmware.com> 1.9.6-3