Skip to content

Commit 9aaf9d9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17314 from hakman/automated-cherry-pick-of-#17311-#17312-#17313-upstream-release-1.32
Automated cherry pick of #17311: Update Calico to v3.29.2 #17312: Update Cilium to v1.16.7 #17313: Update metrics-server to v0.7.2
2 parents 8208da8 + acbd443 commit 9aaf9d9

File tree

43 files changed

+109
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+109
-109
lines changed

‎pkg/model/components/cilium.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4040
}
4141

4242
if c.Version == "" {
43-
c.Version = "v1.16.5"
43+
c.Version = "v1.16.7"
4444
}
4545

4646
if c.EnableEndpointHealthChecking == nil {

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.11
5050
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
51-
manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f
51+
manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7
5252
name: metrics-server.addons.k8s.io
5353
needsPKI: true
5454
selector:

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
- --kubelet-preferred-address-types=Hostname
177177
- --cert-dir=/tmp
178178
- --kubelet-insecure-tls
179-
image: registry.k8s.io/metrics-server/metrics-server:v0.7.1
179+
image: registry.k8s.io/metrics-server/metrics-server:v0.7.2
180180
imagePullPolicy: IfNotPresent
181181
livenessProbe:
182182
failureThreshold: 3

‎tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.11
5050
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
51-
manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f
51+
manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7
5252
name: metrics-server.addons.k8s.io
5353
needsPKI: true
5454
selector:

‎tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
- --kubelet-preferred-address-types=Hostname
177177
- --cert-dir=/tmp
178178
- --kubelet-insecure-tls
179-
image: registry.k8s.io/metrics-server/metrics-server:v0.7.1
179+
image: registry.k8s.io/metrics-server/metrics-server:v0.7.2
180180
imagePullPolicy: IfNotPresent
181181
livenessProbe:
182182
failureThreshold: 3

‎tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.11
5050
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
51-
manifestHash: f5a15bd72ed37b6a3e36df1bddd77c6440f6b067c3b97f3d216e24d2ed014826
51+
manifestHash: 20fc8a62a91b813e570401ad440cc0bc3ebc6423b365b38378d44f1b19e0c69c
5252
name: metrics-server.addons.k8s.io
5353
needsPKI: true
5454
selector:

‎tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
- --kubelet-preferred-address-types=InternalIP
177177
- --cert-dir=/tmp
178178
- --kubelet-insecure-tls
179-
image: registry.k8s.io/metrics-server/metrics-server:v0.7.1
179+
image: registry.k8s.io/metrics-server/metrics-server:v0.7.2
180180
imagePullPolicy: IfNotPresent
181181
livenessProbe:
182182
failureThreshold: 3

‎tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.11
5050
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
51-
manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f
51+
manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7
5252
name: metrics-server.addons.k8s.io
5353
needsPKI: true
5454
selector:

‎tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
- --kubelet-preferred-address-types=Hostname
177177
- --cert-dir=/tmp
178178
- --kubelet-insecure-tls
179-
image: registry.k8s.io/metrics-server/metrics-server:v0.7.1
179+
image: registry.k8s.io/metrics-server/metrics-server:v0.7.2
180180
imagePullPolicy: IfNotPresent
181181
livenessProbe:
182182
failureThreshold: 3

‎tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
version: 9.99.0
100100
- id: k8s-1.25
101101
manifest: networking.projectcalico.org/k8s-1.25.yaml
102-
manifestHash: 55b59a095cb1c3d87680744115ff0f3b8dd2b4112356d8721fc9a9bf33868d04
102+
manifestHash: 0b908c4c6d7093e9cafdde3db1b448088de2de8b42f726869176a7ed43767a80
103103
name: networking.projectcalico.org
104104
prune:
105105
kinds:

‎tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.projectcalico.org-k8s-1.25_content

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6337,7 +6337,7 @@ spec:
63376337
- configMapRef:
63386338
name: kubernetes-services-endpoint
63396339
optional: true
6340-
image: docker.io/calico/node:v3.29.1
6340+
image: docker.io/calico/node:v3.29.2
63416341
imagePullPolicy: IfNotPresent
63426342
lifecycle:
63436343
preStop:
@@ -6417,7 +6417,7 @@ spec:
64176417
- configMapRef:
64186418
name: kubernetes-services-endpoint
64196419
optional: true
6420-
image: docker.io/calico/cni:v3.29.1
6420+
image: docker.io/calico/cni:v3.29.2
64216421
imagePullPolicy: IfNotPresent
64226422
name: install-cni
64236423
securityContext:
@@ -6431,7 +6431,7 @@ spec:
64316431
- calico-node
64326432
- -init
64336433
- -best-effort
6434-
image: docker.io/calico/node:v3.29.1
6434+
image: docker.io/calico/node:v3.29.2
64356435
imagePullPolicy: IfNotPresent
64366436
name: mount-bpffs
64376437
securityContext:
@@ -6560,7 +6560,7 @@ spec:
65606560
value: node
65616561
- name: DATASTORE_TYPE
65626562
value: kubernetes
6563-
image: docker.io/calico/kube-controllers:v3.29.1
6563+
image: docker.io/calico/kube-controllers:v3.29.2
65646564
imagePullPolicy: IfNotPresent
65656565
livenessProbe:
65666566
exec:

‎tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ spec:
212212
sidecarIstioProxyImage: cilium/istio_proxy
213213
toFqdnsDnsRejectResponseCode: refused
214214
tunnel: disabled
215-
version: v1.16.5
215+
version: v1.16.7
216216
nodeTerminationHandler:
217217
cpuRequest: 50m
218218
deleteSQSMsgIfNodeNotFound: false

‎tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
version: 9.99.0
100100
- id: k8s-1.16
101101
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
102-
manifestHash: ec67d5e19b40dc4ec1c07fe956904c93630ef98a1f93cfd9c6eb9004c8e050ea
102+
manifestHash: 701616c03e4ad157a9db6cf3caa3a82fc8c200b7d0b838d50668603abe69e43a
103103
name: networking.cilium.io
104104
needsRollingUpdate: all
105105
selector:

‎tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.cilium.io-k8s-1.16_content

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ spec:
582582
value: api.internal.minimal-ipv6.example.com
583583
- name: KUBERNETES_SERVICE_PORT
584584
value: "443"
585-
image: quay.io/cilium/cilium:v1.16.5
585+
image: quay.io/cilium/cilium:v1.16.7
586586
imagePullPolicy: IfNotPresent
587587
lifecycle:
588588
preStop:
@@ -700,7 +700,7 @@ spec:
700700
value: api.internal.minimal-ipv6.example.com
701701
- name: KUBERNETES_SERVICE_PORT
702702
value: "443"
703-
image: quay.io/cilium/cilium:v1.16.5
703+
image: quay.io/cilium/cilium:v1.16.7
704704
imagePullPolicy: IfNotPresent
705705
name: config
706706
terminationMessagePolicy: FallbackToLogsOnError
@@ -719,7 +719,7 @@ spec:
719719
value: /run/cilium/cgroupv2
720720
- name: BIN_PATH
721721
value: /opt/cni/bin
722-
image: quay.io/cilium/cilium:v1.16.5
722+
image: quay.io/cilium/cilium:v1.16.7
723723
imagePullPolicy: IfNotPresent
724724
name: mount-cgroup
725725
securityContext:
@@ -746,7 +746,7 @@ spec:
746746
env:
747747
- name: BIN_PATH
748748
value: /opt/cni/bin
749-
image: quay.io/cilium/cilium:v1.16.5
749+
image: quay.io/cilium/cilium:v1.16.7
750750
imagePullPolicy: IfNotPresent
751751
name: apply-sysctl-overwrites
752752
securityContext:
@@ -770,7 +770,7 @@ spec:
770770
- /bin/bash
771771
- -c
772772
- --
773-
image: quay.io/cilium/cilium:v1.16.5
773+
image: quay.io/cilium/cilium:v1.16.7
774774
imagePullPolicy: IfNotPresent
775775
name: mount-bpf-fs
776776
securityContext:
@@ -805,7 +805,7 @@ spec:
805805
value: api.internal.minimal-ipv6.example.com
806806
- name: KUBERNETES_SERVICE_PORT
807807
value: "443"
808-
image: quay.io/cilium/cilium:v1.16.5
808+
image: quay.io/cilium/cilium:v1.16.7
809809
imagePullPolicy: IfNotPresent
810810
name: clean-cilium-state
811811
securityContext:
@@ -830,7 +830,7 @@ spec:
830830
name: cilium-run
831831
- command:
832832
- /install-plugin.sh
833-
image: quay.io/cilium/cilium:v1.16.5
833+
image: quay.io/cilium/cilium:v1.16.7
834834
imagePullPolicy: IfNotPresent
835835
name: install-cni-binaries
836836
resources:
@@ -993,7 +993,7 @@ spec:
993993
value: api.internal.minimal-ipv6.example.com
994994
- name: KUBERNETES_SERVICE_PORT
995995
value: "443"
996-
image: quay.io/cilium/operator:v1.16.5
996+
image: quay.io/cilium/operator:v1.16.7
997997
imagePullPolicy: IfNotPresent
998998
livenessProbe:
999999
httpGet:

‎tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ConfigServer:
153153
- https://kops-controller.internal.minimal-warmpool.example.com:3988/
154154
InstanceGroupName: nodes
155155
InstanceGroupRole: Node
156-
NodeupConfigHash: cx4pXSvDOgr+SqcmYZll2ol8Zr1R2mvPBA6r+1p6SBo=
156+
NodeupConfigHash: 5uju3TyrpJia7EVXjpE80ZhpgiJ8lkHOSz6oHXR8ekE=
157157
158158
__EOF_KUBE_ENV
159159

‎tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ spec:
204204
sidecarIstioProxyImage: cilium/istio_proxy
205205
toFqdnsDnsRejectResponseCode: refused
206206
tunnel: vxlan
207-
version: v1.16.5
207+
version: v1.16.7
208208
nodeTerminationHandler:
209209
cpuRequest: 50m
210210
deleteSQSMsgIfNodeNotFound: false

‎tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ spec:
9999
version: 9.99.0
100100
- id: k8s-1.16
101101
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
102-
manifestHash: 79c3afa98cfb90c97da58bbc799657538111c520785c9191ceabcacd65890cd3
102+
manifestHash: 1d069b812e49ee373c8c35c4a7c653e7c7690c8292f34025abd2c33db0064277
103103
name: networking.cilium.io
104104
needsRollingUpdate: all
105105
selector:

‎tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-networking.cilium.io-k8s-1.16_content

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ spec:
583583
value: api.internal.minimal-warmpool.example.com
584584
- name: KUBERNETES_SERVICE_PORT
585585
value: "443"
586-
image: quay.io/cilium/cilium:v1.16.5
586+
image: quay.io/cilium/cilium:v1.16.7
587587
imagePullPolicy: IfNotPresent
588588
lifecycle:
589589
preStop:
@@ -701,7 +701,7 @@ spec:
701701
value: api.internal.minimal-warmpool.example.com
702702
- name: KUBERNETES_SERVICE_PORT
703703
value: "443"
704-
image: quay.io/cilium/cilium:v1.16.5
704+
image: quay.io/cilium/cilium:v1.16.7
705705
imagePullPolicy: IfNotPresent
706706
name: config
707707
terminationMessagePolicy: FallbackToLogsOnError
@@ -720,7 +720,7 @@ spec:
720720
value: /run/cilium/cgroupv2
721721
- name: BIN_PATH
722722
value: /opt/cni/bin
723-
image: quay.io/cilium/cilium:v1.16.5
723+
image: quay.io/cilium/cilium:v1.16.7
724724
imagePullPolicy: IfNotPresent
725725
name: mount-cgroup
726726
securityContext:
@@ -747,7 +747,7 @@ spec:
747747
env:
748748
- name: BIN_PATH
749749
value: /opt/cni/bin
750-
image: quay.io/cilium/cilium:v1.16.5
750+
image: quay.io/cilium/cilium:v1.16.7
751751
imagePullPolicy: IfNotPresent
752752
name: apply-sysctl-overwrites
753753
securityContext:
@@ -771,7 +771,7 @@ spec:
771771
- /bin/bash
772772
- -c
773773
- --
774-
image: quay.io/cilium/cilium:v1.16.5
774+
image: quay.io/cilium/cilium:v1.16.7
775775
imagePullPolicy: IfNotPresent
776776
name: mount-bpf-fs
777777
securityContext:
@@ -806,7 +806,7 @@ spec:
806806
value: api.internal.minimal-warmpool.example.com
807807
- name: KUBERNETES_SERVICE_PORT
808808
value: "443"
809-
image: quay.io/cilium/cilium:v1.16.5
809+
image: quay.io/cilium/cilium:v1.16.7
810810
imagePullPolicy: IfNotPresent
811811
name: clean-cilium-state
812812
securityContext:
@@ -831,7 +831,7 @@ spec:
831831
name: cilium-run
832832
- command:
833833
- /install-plugin.sh
834-
image: quay.io/cilium/cilium:v1.16.5
834+
image: quay.io/cilium/cilium:v1.16.7
835835
imagePullPolicy: IfNotPresent
836836
name: install-cni-binaries
837837
resources:
@@ -994,7 +994,7 @@ spec:
994994
value: api.internal.minimal-warmpool.example.com
995995
- name: KUBERNETES_SERVICE_PORT
996996
value: "443"
997-
image: quay.io/cilium/operator:v1.16.5
997+
image: quay.io/cilium/operator:v1.16.7
998998
imagePullPolicy: IfNotPresent
999999
livenessProbe:
10001000
httpGet:

‎tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ containerdConfig:
6161
usesLegacyGossip: false
6262
usesNoneDNS: false
6363
warmPoolImages:
64-
- quay.io/cilium/cilium:v1.16.5
65-
- quay.io/cilium/operator:v1.16.5
64+
- quay.io/cilium/cilium:v1.16.7
65+
- quay.io/cilium/operator:v1.16.7
6666
- registry.k8s.io/kube-proxy:v1.32.0
6767
- registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0

‎tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ spec:
200200
sidecarIstioProxyImage: cilium/istio_proxy
201201
toFqdnsDnsRejectResponseCode: refused
202202
tunnel: vxlan
203-
version: v1.16.5
203+
version: v1.16.7
204204
nonMasqueradeCIDR: 100.64.0.0/10
205205
podCIDR: 100.96.0.0/11
206206
secretStore: memfs://tests/scw-minimal.k8s.local/secrets

‎tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ spec:
5555
version: 9.99.0
5656
- id: k8s-1.16
5757
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
58-
manifestHash: b8ff520e1fab86258a9119be0ce2e56d2975f8658db16d6fb74ebd5a62daa24d
58+
manifestHash: cceac64c304516725d40231c9b73cff5e8299856760fb6cea3222f1c21d080f7
5959
name: networking.cilium.io
6060
needsRollingUpdate: all
6161
selector:

0 commit comments

Comments
 (0)