kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8982 from olemarkus/cilium-bump-april 

Bump cilium to 1.7.2
This commit is contained in:
Kubernetes Prow Robot 2020-04-27 13:04:05 -07:00 committed by GitHub
parent fd512ca165 3e3b2019dc
commit 8d0933fe35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/models/bindata.go
View File

@ -4708,7 +4708,7 @@ spec:
value: {{ . }}
{{ end }}
{{ with .Networking.Cilium }}
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.1" }}"
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}"
imagePullPolicy: IfNotPresent
lifecycle:
postStart:
@ -4811,7 +4811,7 @@ spec:
key: wait-bpf-mount
name: cilium-config
optional: true
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.1" }}"
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}"
## end of ` + "`" + `with .Networking.Cilium` + "`" + `
#{{ end }}
imagePullPolicy: IfNotPresent
@ -5012,7 +5012,7 @@ spec:
- name: KUBERNETES_SERVICE_PORT
value: "443"
{{ with .Networking.Cilium }}
image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.1{{- else -}}{{ .Version }}{{- end -}}"
image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.2{{- else -}}{{ .Version }}{{- end -}}"
imagePullPolicy: IfNotPresent
name: cilium-operator
{{ if .EnablePrometheusMetrics }}

6
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
View File

@ -419,7 +419,7 @@ spec:
value: {{ . }}
{{ end }}
{{ with .Networking.Cilium }}
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.1" }}"
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}"
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.1" }}"
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.2" }}"
## 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.1{{- else -}}{{ .Version }}{{- end -}}"
image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.2{{- else -}}{{ .Version }}{{- end -}}"
imagePullPolicy: IfNotPresent
name: cilium-operator
{{ if .EnablePrometheusMetrics }}

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -988,7 +988,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if b.cluster.Spec.Networking.Cilium != nil {
key := "networking.cilium.io"
version := "1.7.1-kops.2"
version := "1.7.2-kops.1"
{
id := "k8s-1.7"

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -93,12 +93,12 @@ spec:
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.1-kops.2
version: 1.7.2-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.cilium.io/k8s-1.12.yaml
manifestHash: b9cc0e3b5e63d6aa283e2d1111a150680745abd2
manifestHash: 80953cfa6afa4d212f85364fe050bf52051b1d89
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.1-kops.2
version: 1.7.2-kops.1