Merge pull request #8388 from johngmyers/automated-cherry-pick-of-#83…

…79-upstream-release-1.16 Automated cherry pick of #8379: Add Cilium.EnablePolicy back into templates
kubernetes · Jan 22, 2020 · 4b2abf4 · 4b2abf4
2 parents 4ef94d8 + 956ab3f
commit 4b2abf4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
@@ -354,6 +354,10 @@ spec:
               key: custom-cni-conf
               name: cilium-config
               optional: true
+        {{ with .Networking.Cilium.EnablePolicy }}
+        - name: CILIUM_ENABLE_POLICY
+          value: {{ . }}
+        {{ end }}
 {{ with .Networking.Cilium }}
         image: "docker.io/cilium/cilium:{{ .Version }}"
         imagePullPolicy: IfNotPresent

diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template
@@ -354,6 +354,10 @@ spec:
               key: custom-cni-conf
               name: cilium-config
               optional: true
+        {{ with .Networking.Cilium.EnablePolicy }}
+        - name: CILIUM_ENABLE_POLICY
+          value: {{ . }}
+        {{ end }}
 {{ with .Networking.Cilium }}
         image: "docker.io/cilium/cilium:{{ .Version }}"
         imagePullPolicy: IfNotPresent

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -1117,7 +1117,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 
 	if b.cluster.Spec.Networking.Cilium != nil {
 		key := "networking.cilium.io"
-		version := "1.6.4-kops.1"
+		version := "1.6.4-kops.2"
 
 		{
 			id := "k8s-1.7"

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -119,12 +119,12 @@ spec:
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.6.4-kops.1
+    version: 1.6.4-kops.2
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
     manifestHash: 2d40b9ab7453b4a0a413196fae4c8bdcd62c69ce
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.6.4-kops.1
+    version: 1.6.4-kops.2