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

Bump cilium to 1.7.3

This commit is contained in:
Ole Markus With 2020-04-30 07:29:15 +02:00
parent b738f8e946
commit 7c49f283c4
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

@ -4707,7 +4707,7 @@ spec:
value: {{ . }} value: {{ . }}
{{ end }} {{ end }}
{{ with .Networking.Cilium }} {{ 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 imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
postStart: postStart:
@ -4810,7 +4810,7 @@ spec:
key: wait-bpf-mount key: wait-bpf-mount
name: cilium-config name: cilium-config
optional: true 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 of ` + "`" + `with .Networking.Cilium` + "`" + `
#{{ end }} #{{ end }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
@ -5011,7 +5011,7 @@ spec:
- name: KUBERNETES_SERVICE_PORT - name: KUBERNETES_SERVICE_PORT
value: "443" value: "443"
{{ with .Networking.Cilium }} {{ 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 imagePullPolicy: IfNotPresent
name: cilium-operator name: cilium-operator
{{ if .EnablePrometheusMetrics }} {{ if .EnablePrometheusMetrics }}

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

@ -419,7 +419,7 @@ spec:
value: {{ . }} value: {{ . }}
{{ end }} {{ end }}
{{ with .Networking.Cilium }} {{ 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 imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
postStart: postStart:
@ -522,7 +522,7 @@ spec:
key: wait-bpf-mount key: wait-bpf-mount
name: cilium-config name: cilium-config
optional: true 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 of `with .Networking.Cilium`
#{{ end }} #{{ end }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
@ -723,7 +723,7 @@ spec:
- name: KUBERNETES_SERVICE_PORT - name: KUBERNETES_SERVICE_PORT
value: "443" value: "443"
{{ with .Networking.Cilium }} {{ 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 imagePullPolicy: IfNotPresent
name: cilium-operator name: cilium-operator
{{ if .EnablePrometheusMetrics }} {{ 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 { if b.cluster.Spec.Networking.Cilium != nil {
key := "networking.cilium.io" key := "networking.cilium.io"
version := "1.7.2-kops.1" version := "1.7.3-kops.1"
{ {
id := "k8s-1.7" 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 name: networking.cilium.io
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
version: 1.7.2-kops.1 version: 1.7.3-kops.1
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: networking.cilium.io/k8s-1.12.yaml manifest: networking.cilium.io/k8s-1.12.yaml
manifestHash: 80953cfa6afa4d212f85364fe050bf52051b1d89 manifestHash: 2cac1ca4c0db3b48bb066d1477e6cdfe4f3080d5
name: networking.cilium.io name: networking.cilium.io
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
version: 1.7.2-kops.1 version: 1.7.3-kops.1