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

Automated cherry pick of #17170: Update Cilium to v1.16.5 #17173

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Automated cherry pick of #17170: Update Cilium to v1.16.5 #17173

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
637e8c4
Update Cilium to v1.16.5
hakman Jan 6, 2025
d76e78f
hack/update-expected.sh
hakman Jan 6, 2025
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
2 changes: 1 addition & 1 deletion pkg/model/components/cilium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o *kops.Cluster) error {
}

if c.Version == "" {
c.Version = "v1.16.3"
c.Version = "v1.16.5"
}

if c.EnableEndpointHealthChecking == nil {
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: disabled
version: v1.16.3
version: v1.16.5
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
2 changes: 1 addition & 1 deletion .../minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: 3dec2f27921f9e61bd722d058ec85a68e459d1fe3f09055ef9d8b03acf1a55dd
manifestHash: ec67d5e19b40dc4ec1c07fe956904c93630ef98a1f93cfd9c6eb9004c8e050ea
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
16 changes: 8 additions & 8 deletions .../data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -700,7 +700,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: config
terminationMessagePolicy: FallbackToLogsOnError
Expand All @@ -719,7 +719,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-cgroup
securityContext:
Expand All @@ -746,7 +746,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
securityContext:
Expand All @@ -770,7 +770,7 @@ spec:
- /bin/bash
- -c
- --
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
securityContext:
Expand Down Expand Up @@ -805,7 +805,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand All @@ -830,7 +830,7 @@ spec:
name: cilium-run
- command:
- /install-plugin.sh
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: install-cni-binaries
resources:
Expand Down Expand Up @@ -993,7 +993,7 @@ spec:
value: api.internal.minimal-ipv6.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/operator:v1.16.3
image: quay.io/cilium/operator:v1.16.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...er/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.minimal-warmpool.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: hDw7GDccItBvn+jlc6WzJY9fsp/mwxeXHtMTGK8EWnY=
NodeupConfigHash: CrKN+2s86J9XP6beZL08+/dOp8xaeEYWKVhWt2hLo68=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...gration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.3
version: v1.16.5
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
2 changes: 1 addition & 1 deletion ...minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: bc7f7e8765ce60f4a51faa622445f05312d6f6ff5c2cdae2bbc2b7fdaabf35fa
manifestHash: 79c3afa98cfb90c97da58bbc799657538111c520785c9191ceabcacd65890cd3
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
16 changes: 8 additions & 8 deletions ...a/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -701,7 +701,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: config
terminationMessagePolicy: FallbackToLogsOnError
Expand All @@ -720,7 +720,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-cgroup
securityContext:
Expand All @@ -747,7 +747,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
securityContext:
Expand All @@ -771,7 +771,7 @@ spec:
- /bin/bash
- -c
- --
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
securityContext:
Expand Down Expand Up @@ -806,7 +806,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand All @@ -831,7 +831,7 @@ spec:
name: cilium-run
- command:
- /install-plugin.sh
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: install-cni-binaries
resources:
Expand Down Expand Up @@ -994,7 +994,7 @@ spec:
value: api.internal.minimal-warmpool.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/operator:v1.16.3
image: quay.io/cilium/operator:v1.16.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions ...integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ containerdConfig:
usesLegacyGossip: false
usesNoneDNS: false
warmPoolImages:
- quay.io/cilium/cilium:v1.16.3
- quay.io/cilium/operator:v1.16.3
- quay.io/cilium/cilium:v1.16.5
- quay.io/cilium/operator:v1.16.5
- registry.k8s.io/kube-proxy:v1.26.0
- registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.12
2 changes: 1 addition & 1 deletion ...gration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.3
version: v1.16.5
nonMasqueradeCIDR: 100.64.0.0/10
podCIDR: 100.96.0.0/11
secretStore: memfs://tests/scw-minimal.k8s.local/secrets
Expand Down
2 changes: 1 addition & 1 deletion ...luster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: b09e39b605118cc04f98b48d24b0fa6c88487b04a0108574a61692c222f68e1b
manifestHash: b8ff520e1fab86258a9119be0ce2e56d2975f8658db16d6fb74ebd5a62daa24d
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
16 changes: 8 additions & 8 deletions ...way/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ spec:
value: api.internal.scw-minimal.k8s.local
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -701,7 +701,7 @@ spec:
value: api.internal.scw-minimal.k8s.local
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: config
terminationMessagePolicy: FallbackToLogsOnError
Expand All @@ -720,7 +720,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-cgroup
securityContext:
Expand All @@ -747,7 +747,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
securityContext:
Expand All @@ -771,7 +771,7 @@ spec:
- /bin/bash
- -c
- --
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
securityContext:
Expand Down Expand Up @@ -806,7 +806,7 @@ spec:
value: api.internal.scw-minimal.k8s.local
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand All @@ -831,7 +831,7 @@ spec:
name: cilium-run
- command:
- /install-plugin.sh
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: install-cni-binaries
resources:
Expand Down Expand Up @@ -994,7 +994,7 @@ spec:
value: api.internal.scw-minimal.k8s.local
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/operator:v1.16.3
image: quay.io/cilium/operator:v1.16.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...ration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: disabled
version: v1.16.3
version: v1.16.5
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
2 changes: 1 addition & 1 deletion ...r/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: f7612a95ce7e6eb6c7f4aff40ef362372345b45c4697b46ef78f5518d279e566
manifestHash: adccc130fb74a2aaf5784d76e54f1798aff3fd51e4e1aea1ed3a567d37d79a5f
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down
16 changes: 8 additions & 8 deletions ...data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ spec:
value: api.internal.privatecilium.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
lifecycle:
postStart:
Expand Down Expand Up @@ -728,7 +728,7 @@ spec:
value: api.internal.privatecilium.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: config
terminationMessagePolicy: FallbackToLogsOnError
Expand All @@ -747,7 +747,7 @@ spec:
value: /run/cilium/cgroupv2
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-cgroup
securityContext:
Expand All @@ -774,7 +774,7 @@ spec:
env:
- name: BIN_PATH
value: /opt/cni/bin
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: apply-sysctl-overwrites
securityContext:
Expand All @@ -798,7 +798,7 @@ spec:
- /bin/bash
- -c
- --
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: mount-bpf-fs
securityContext:
Expand Down Expand Up @@ -833,7 +833,7 @@ spec:
value: api.internal.privatecilium.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand All @@ -858,7 +858,7 @@ spec:
name: cilium-run
- command:
- /install-plugin.sh
image: quay.io/cilium/cilium:v1.16.3
image: quay.io/cilium/cilium:v1.16.5
imagePullPolicy: IfNotPresent
name: install-cni-binaries
resources:
Expand Down Expand Up @@ -1021,7 +1021,7 @@ spec:
value: api.internal.privatecilium.example.com
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: quay.io/cilium/operator:v1.16.3
image: quay.io/cilium/operator:v1.16.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ spec:
sidecarIstioProxyImage: cilium/istio_proxy
toFqdnsDnsRejectResponseCode: refused
tunnel: vxlan
version: v1.16.3
version: v1.16.5
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
Loading
Loading