Skip to content

Commit

Permalink
Merge pull request #9028 from olemarkus/automated-cherry-pick-of-#902…
Browse files Browse the repository at this point in the history
…6-origin-release-1.17

Automated cherry pick of #9026: Bump cilium to 1.7.3
  • Loading branch information
k8s-ci-robot authored May 4, 2020
2 parents 8c9807a + 0ac351b commit 75819f0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,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:
Expand Down Expand Up @@ -484,7 +484,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
Expand Down Expand Up @@ -664,7 +664,7 @@ spec:
key: AWS_DEFAULT_REGION
name: cilium-aws
optional: true
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 }}
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,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: 712c904ba592ca12e660b9248256a3d329fd6d9c
manifestHash: 75c997c0d694e5607f754047d3f64634e3eb3bd6
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.2-kops.1
version: 1.7.3-kops.1

0 comments on commit 75819f0

Please sign in to comment.