Merge pull request #11554 from olemarkus/bump-cilium-may

Bump default cilium to 1.9.7
kubernetes · May 21, 2021 · 6b8e769 · 6b8e769
2 parents c62090f + 5869d4e
commit 6b8e769
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/model/components/cilium.go b/pkg/model/components/cilium.go
@@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
 	}
 
 	if c.Version == "" {
-		c.Version = "v1.9.6"
+		c.Version = "v1.9.7"
 	}
 
 	version, _ := semver.ParseTolerant(c.Version)

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -61,7 +61,7 @@ spec:
     version: 1.17.0
   - id: k8s-1.12
     manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
-    manifestHash: 368ab627c5fb9087ad60df6bf4fe5dc29c017f79
+    manifestHash: 2588f6ea8bea0085170c843ef4fd1c56141adad1
     name: networking.cilium.io
     needsRollingUpdate: all
     selector: