Merge pull request #9871 from olemarkus/cilium-upgrades-sept-2

Bump cilium to 1.8.3
2020-09-05 09:15:41 -07:00 · 2020-09-05 09:15:41 -07:00 · bac4afa3e5
parent d8b7310c69 3ac61c7ea9
commit bac4afa3e5
2 changed files with 2 additions and 2 deletions
--- a/pkg/model/components/cilium.go
+++ b/pkg/model/components/cilium.go
@ -42,7 +42,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
 		if b.Context.IsKubernetesLT("1.12.0") {
 			c.Version = "v1.6.11"
 		} else {
-			c.Version = "v1.8.2"
+			c.Version = "v1.8.3"
 		}
 	}

--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@ -89,7 +89,7 @@ spec:
  - id: k8s-1.12
    kubernetesVersion: '>=1.12.0'
    manifest: networking.cilium.io/k8s-1.12-v1.8.yaml
-    manifestHash: bbfec63621371b28012f9d5a82678099071d9857
+    manifestHash: 91d442758bc9678f9be8e1b08ef393bb7d2066a0
    name: networking.cilium.io
    selector:
      role.kubernetes.io/networking: "1"