Merge pull request #8487 from olemarkus/automated-cherry-pick-of-#848…

…4-origin-release-1.16 Automated cherry pick of #8484: Update cilium to 1.6.6
kubernetes · Feb 7, 2020 · 9918944 · 9918944
2 parents ce47310 + 51e4dc4
commit 9918944
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -155,7 +155,7 @@ type AmazonVPCNetworkingSpec struct {
 	ImageName string `json:"imageName,omitempty"`
 }
 
-const CiliumDefaultVersion = "v1.6.4"
+const CiliumDefaultVersion = "v1.6.6"
 
 // CiliumNetworkingSpec declares that we want Cilium networking
 type CiliumNetworkingSpec struct {

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -115,15 +115,15 @@ spec:
   - id: k8s-1.7
     kubernetesVersion: '>=1.7.0 <1.12.0'
     manifest: networking.cilium.io/k8s-1.7.yaml
-    manifestHash: 2d40b9ab7453b4a0a413196fae4c8bdcd62c69ce
+    manifestHash: 6928e95ec4b8359075e3dfb069f74e290e2e6eb2
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"
     version: 1.6.4-kops.3
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: 47d2613d2d7380172350417e1cd282ea7cf893c3
+    manifestHash: 84295d293c8a461f7d510721c48b969cd1d99e54
     name: networking.cilium.io
     selector:
       role.kubernetes.io/networking: "1"