Merge pull request #11659 from olemarkus/cilium-1-10-default

Bump default cilium to 1.10
2021-06-01 01:06:27 -07:00 · 2021-06-01 01:06:27 -07:00 · 373c37d948
parent 88073e349a 553fdd5840
commit 373c37d948
2 changed files with 5 additions and 5 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.7"
+		c.Version = "v1.10.0"
 	}

 	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
@ -59,11 +59,11 @@ spec:
    selector:
      k8s-addon: storage-aws.addons.k8s.io
    version: 1.17.0
-  - id: k8s-1.12
-    manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
-    manifestHash: 2588f6ea8bea0085170c843ef4fd1c56141adad1
+  - id: k8s-1.16
+    manifest: networking.cilium.io/k8s-1.16-v1.10.yaml
+    manifestHash: 461df69665b35c37bc1cc503edba447c205af8f3
    name: networking.cilium.io
    needsRollingUpdate: all
    selector:
      role.kubernetes.io/networking: "1"
-    version: 1.9.4-kops.1
+    version: 1.10.0-kops.1