Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cilium bump 1.18 #10405

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Cilium bump 1.18 #10405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8ef664
Bump cilium version to 1.7.12
Dec 10, 2020
fcbfe53
Add missing permissions for cilium-operator
codablock Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions upup/models/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,14 @@ rules:
- ciliumidentities/status
verbs:
- '*'
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- create
- get
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand Down Expand Up @@ -522,7 +530,7 @@ spec:
key: wait-bpf-mount
name: cilium-config
optional: true
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.5" }}"
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.12" }}"
## end of `with .Networking.Cilium`
#{{ end }}
imagePullPolicy: IfNotPresent
Expand Down Expand Up @@ -723,7 +731,7 @@ spec:
- name: KUBERNETES_SERVICE_PORT
value: "443"
{{ with .Networking.Cilium }}
image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.5{{- else -}}{{ .Version }}{{- end -}}"
image: "docker.io/cilium/operator:{{- if eq .Version "" -}}v1.7.12{{- else -}}{{ .Version }}{{- end -}}"
imagePullPolicy: IfNotPresent
name: cilium-operator
{{ if .EnablePrometheusMetrics }}
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

if b.cluster.Spec.Networking.Cilium != nil {
key := "networking.cilium.io"
version := "1.7.3-kops.1"
version := "1.7.12-kops.1"

{
id := "k8s-1.7"
Expand Down
6 changes: 3 additions & 3 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ spec:
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.3-kops.1
version: 1.7.12-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.cilium.io/k8s-1.12.yaml
manifestHash: 15a4c6bf41e05753c76747d556f275e9bfec165b
manifestHash: 92894772608f1bcf5c0c3fa9f79e88acb413a98f
name: networking.cilium.io
selector:
role.kubernetes.io/networking: "1"
version: 1.7.3-kops.1
version: 1.7.12-kops.1