diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 8e8a6f3026..c40e6556fd 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -4707,7 +4707,7 @@ spec: value: {{ . }} {{ end }} {{ with .Networking.Cilium }} - image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}" + image: "docker.io/cilium/cilium:{{- or .Version "v1.7.3" }}" imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -4810,7 +4810,7 @@ spec: key: wait-bpf-mount name: cilium-config optional: true - image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}" + image: "docker.io/cilium/cilium:{{- or .Version "v1.7.3" }}" ## end of ` + "`" + `with .Networking.Cilium` + "`" + ` #{{ end }} imagePullPolicy: IfNotPresent @@ -5011,7 +5011,7 @@ spec: - name: KUBERNETES_SERVICE_PORT value: "443" {{ with .Networking.Cilium }} - image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.2{{- else -}}{{ .Version }}{{- end -}}" + image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.3{{- else -}}{{ .Version }}{{- end -}}" imagePullPolicy: IfNotPresent name: cilium-operator {{ if .EnablePrometheusMetrics }} diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template index c4fcb8c4f0..3b052ac57f 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template @@ -419,7 +419,7 @@ spec: value: {{ . }} {{ end }} {{ with .Networking.Cilium }} - image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}" + image: "docker.io/cilium/cilium:{{- or .Version "v1.7.3" }}" imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -522,7 +522,7 @@ spec: key: wait-bpf-mount name: cilium-config optional: true - image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}" + image: "docker.io/cilium/cilium:{{- or .Version "v1.7.3" }}" ## end of `with .Networking.Cilium` #{{ end }} imagePullPolicy: IfNotPresent @@ -723,7 +723,7 @@ spec: - name: KUBERNETES_SERVICE_PORT value: "443" {{ with .Networking.Cilium }} - image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.2{{- else -}}{{ .Version }}{{- end -}}" + image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.3{{- else -}}{{ .Version }}{{- end -}}" imagePullPolicy: IfNotPresent name: cilium-operator {{ if .EnablePrometheusMetrics }} diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 3d3d36e107..8327d7e1d3 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -988,7 +988,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if b.cluster.Spec.Networking.Cilium != nil { key := "networking.cilium.io" - version := "1.7.2-kops.1" + version := "1.7.3-kops.1" { id := "k8s-1.7" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 4927bd3215..e087ffe352 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -93,12 +93,12 @@ spec: name: networking.cilium.io selector: role.kubernetes.io/networking: "1" - version: 1.7.2-kops.1 + version: 1.7.3-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: networking.cilium.io/k8s-1.12.yaml - manifestHash: 80953cfa6afa4d212f85364fe050bf52051b1d89 + manifestHash: 2cac1ca4c0db3b48bb066d1477e6cdfe4f3080d5 name: networking.cilium.io selector: role.kubernetes.io/networking: "1" - version: 1.7.2-kops.1 + version: 1.7.3-kops.1