Merge pull request #11344 from olemarkus/bump-cilium

Bump cilium to 1.9.6
2021-04-28 01:48:49 -07:00 · 2021-04-28 01:48:49 -07:00 · 06f2f25623
parent 021f0e5f55 01ccf4590f
commit 06f2f25623
2 changed files with 2 additions and 2 deletions
--- 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.4"
+		c.Version = "v1.9.6"
 	}

 	version, _ := semver.ParseTolerant(c.Version)
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@ -71,7 +71,7 @@ spec:
    version: 1.17.0
  - id: k8s-1.12
    manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
-    manifestHash: 0e59024a8025c5a3beb4c2c707b03d5233e53c7c
+    manifestHash: 2efe03944de989eca15f035e5d1de72bf1cfbace
    name: networking.cilium.io
    needsRollingUpdate: all
    selector: