mirror of https://github.com/kubernetes/kops.git
Bump cilium to 1.7.3
This commit is contained in:
parent
b738f8e946
commit
7c49f283c4
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue