Skip to content

Commit 855f6fa

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #16627 from rifelpet/cilium-1156
Upgrade Cilium to v1.15.6
2 parents cbc5530 + ecac334 commit 855f6fa

File tree

27 files changed

+71
-71
lines changed

27 files changed

+71
-71
lines changed

‎pkg/model/components/cilium.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
4040
}
4141

4242
if c.Version == "" {
43-
c.Version = "v1.15.4"
43+
c.Version = "v1.15.6"
4444
}
4545

4646
if c.EnableEndpointHealthChecking == nil {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ spec:
226226
sidecarIstioProxyImage: cilium/istio_proxy
227227
toFqdnsDnsRejectResponseCode: refused
228228
tunnel: disabled
229-
version: v1.15.4
229+
version: v1.15.6
230230
nodeTerminationHandler:
231231
cpuRequest: 50m
232232
deleteSQSMsgIfNodeNotFound: false

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ spec:
106106
version: 9.99.0
107107
- id: k8s-1.16
108108
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
109-
manifestHash: 6b8c194f2e4b5c13c5adf56111305077a641fbddff4fb999d2a0e817a820cf53
109+
manifestHash: b9879c934ae3fc644e07f15629981bb9bf0162335a4ef5be413182fcfc66897a
110110
name: networking.cilium.io
111111
needsRollingUpdate: all
112112
selector:

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ spec:
550550
value: api.internal.minimal-ipv6.example.com
551551
- name: KUBERNETES_SERVICE_PORT
552552
value: "443"
553-
image: quay.io/cilium/cilium:v1.15.4
553+
image: quay.io/cilium/cilium:v1.15.6
554554
imagePullPolicy: IfNotPresent
555555
lifecycle:
556556
preStop:
@@ -647,7 +647,7 @@ spec:
647647
value: api.internal.minimal-ipv6.example.com
648648
- name: KUBERNETES_SERVICE_PORT
649649
value: "443"
650-
image: quay.io/cilium/cilium:v1.15.4
650+
image: quay.io/cilium/cilium:v1.15.6
651651
imagePullPolicy: IfNotPresent
652652
name: config
653653
terminationMessagePolicy: FallbackToLogsOnError
@@ -666,7 +666,7 @@ spec:
666666
value: /run/cilium/cgroupv2
667667
- name: BIN_PATH
668668
value: /opt/cni/bin
669-
image: quay.io/cilium/cilium:v1.15.4
669+
image: quay.io/cilium/cilium:v1.15.6
670670
imagePullPolicy: IfNotPresent
671671
name: mount-cgroup
672672
securityContext:
@@ -687,7 +687,7 @@ spec:
687687
env:
688688
- name: BIN_PATH
689689
value: /opt/cni/bin
690-
image: quay.io/cilium/cilium:v1.15.4
690+
image: quay.io/cilium/cilium:v1.15.6
691691
imagePullPolicy: IfNotPresent
692692
name: apply-sysctl-overwrites
693693
securityContext:
@@ -717,7 +717,7 @@ spec:
717717
value: api.internal.minimal-ipv6.example.com
718718
- name: KUBERNETES_SERVICE_PORT
719719
value: "443"
720-
image: quay.io/cilium/cilium:v1.15.4
720+
image: quay.io/cilium/cilium:v1.15.6
721721
imagePullPolicy: IfNotPresent
722722
name: clean-cilium-state
723723
securityContext:
@@ -734,7 +734,7 @@ spec:
734734
name: cilium-run
735735
- command:
736736
- /install-plugin.sh
737-
image: quay.io/cilium/cilium:v1.15.4
737+
image: quay.io/cilium/cilium:v1.15.6
738738
imagePullPolicy: IfNotPresent
739739
name: install-cni-binaries
740740
resources:
@@ -889,7 +889,7 @@ spec:
889889
value: api.internal.minimal-ipv6.example.com
890890
- name: KUBERNETES_SERVICE_PORT
891891
value: "443"
892-
image: quay.io/cilium/operator:v1.15.4
892+
image: quay.io/cilium/operator:v1.15.6
893893
imagePullPolicy: IfNotPresent
894894
livenessProbe:
895895
httpGet:

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

+1-1
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: 2pekI4BdRgjut5UcgcI8QZVszjluZGVgnBmPbmfvIl4=
156+
NodeupConfigHash: Qk29AY0f5+WYSZtngVmowAvt0IFItqN2mBDATTa1yqU=
157157
158158
__EOF_KUBE_ENV
159159

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ spec:
218218
sidecarIstioProxyImage: cilium/istio_proxy
219219
toFqdnsDnsRejectResponseCode: refused
220220
tunnel: vxlan
221-
version: v1.15.4
221+
version: v1.15.6
222222
nodeTerminationHandler:
223223
cpuRequest: 50m
224224
deleteSQSMsgIfNodeNotFound: false

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

+1-1
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: 421c780d3ecd73290adddfc80e7f16fc46e7908483653b723aee415f43a68004
102+
manifestHash: a1a193f3b5a7e4978166141793abd91ca31da43c5d22ccac28cbe8a9e971620e
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

+7-7
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ spec:
551551
value: api.internal.minimal-warmpool.example.com
552552
- name: KUBERNETES_SERVICE_PORT
553553
value: "443"
554-
image: quay.io/cilium/cilium:v1.15.4
554+
image: quay.io/cilium/cilium:v1.15.6
555555
imagePullPolicy: IfNotPresent
556556
lifecycle:
557557
preStop:
@@ -648,7 +648,7 @@ spec:
648648
value: api.internal.minimal-warmpool.example.com
649649
- name: KUBERNETES_SERVICE_PORT
650650
value: "443"
651-
image: quay.io/cilium/cilium:v1.15.4
651+
image: quay.io/cilium/cilium:v1.15.6
652652
imagePullPolicy: IfNotPresent
653653
name: config
654654
terminationMessagePolicy: FallbackToLogsOnError
@@ -667,7 +667,7 @@ spec:
667667
value: /run/cilium/cgroupv2
668668
- name: BIN_PATH
669669
value: /opt/cni/bin
670-
image: quay.io/cilium/cilium:v1.15.4
670+
image: quay.io/cilium/cilium:v1.15.6
671671
imagePullPolicy: IfNotPresent
672672
name: mount-cgroup
673673
securityContext:
@@ -688,7 +688,7 @@ spec:
688688
env:
689689
- name: BIN_PATH
690690
value: /opt/cni/bin
691-
image: quay.io/cilium/cilium:v1.15.4
691+
image: quay.io/cilium/cilium:v1.15.6
692692
imagePullPolicy: IfNotPresent
693693
name: apply-sysctl-overwrites
694694
securityContext:
@@ -718,7 +718,7 @@ spec:
718718
value: api.internal.minimal-warmpool.example.com
719719
- name: KUBERNETES_SERVICE_PORT
720720
value: "443"
721-
image: quay.io/cilium/cilium:v1.15.4
721+
image: quay.io/cilium/cilium:v1.15.6
722722
imagePullPolicy: IfNotPresent
723723
name: clean-cilium-state
724724
securityContext:
@@ -735,7 +735,7 @@ spec:
735735
name: cilium-run
736736
- command:
737737
- /install-plugin.sh
738-
image: quay.io/cilium/cilium:v1.15.4
738+
image: quay.io/cilium/cilium:v1.15.6
739739
imagePullPolicy: IfNotPresent
740740
name: install-cni-binaries
741741
resources:
@@ -890,7 +890,7 @@ spec:
890890
value: api.internal.minimal-warmpool.example.com
891891
- name: KUBERNETES_SERVICE_PORT
892892
value: "443"
893-
image: quay.io/cilium/operator:v1.15.4
893+
image: quay.io/cilium/operator:v1.15.6
894894
imagePullPolicy: IfNotPresent
895895
livenessProbe:
896896
httpGet:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ containerdConfig:
6464
usesLegacyGossip: false
6565
usesNoneDNS: false
6666
warmPoolImages:
67-
- quay.io/cilium/cilium:v1.15.4
68-
- quay.io/cilium/operator:v1.15.4
67+
- quay.io/cilium/cilium:v1.15.6
68+
- quay.io/cilium/operator:v1.15.6
6969
- registry.k8s.io/kube-proxy:v1.26.0
7070
- registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ spec:
199199
sidecarIstioProxyImage: cilium/istio_proxy
200200
toFqdnsDnsRejectResponseCode: refused
201201
tunnel: vxlan
202-
version: v1.15.4
202+
version: v1.15.6
203203
nonMasqueradeCIDR: 100.64.0.0/10
204204
podCIDR: 100.96.0.0/11
205205
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

+1-1
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: 4652a3f140f42408f62a64d19bd71fabf901ca4330b8a70dc0a7e7880097cc9e
58+
manifestHash: 7b74c26eba86a08e584e9621b100ef63a3aedca452958210ae67304f84d40542
5959
name: networking.cilium.io
6060
needsRollingUpdate: all
6161
selector:

‎tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-networking.cilium.io-k8s-1.16_content

+7-7
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ spec:
551551
value: api.internal.scw-minimal.k8s.local
552552
- name: KUBERNETES_SERVICE_PORT
553553
value: "443"
554-
image: quay.io/cilium/cilium:v1.15.4
554+
image: quay.io/cilium/cilium:v1.15.6
555555
imagePullPolicy: IfNotPresent
556556
lifecycle:
557557
preStop:
@@ -648,7 +648,7 @@ spec:
648648
value: api.internal.scw-minimal.k8s.local
649649
- name: KUBERNETES_SERVICE_PORT
650650
value: "443"
651-
image: quay.io/cilium/cilium:v1.15.4
651+
image: quay.io/cilium/cilium:v1.15.6
652652
imagePullPolicy: IfNotPresent
653653
name: config
654654
terminationMessagePolicy: FallbackToLogsOnError
@@ -667,7 +667,7 @@ spec:
667667
value: /run/cilium/cgroupv2
668668
- name: BIN_PATH
669669
value: /opt/cni/bin
670-
image: quay.io/cilium/cilium:v1.15.4
670+
image: quay.io/cilium/cilium:v1.15.6
671671
imagePullPolicy: IfNotPresent
672672
name: mount-cgroup
673673
securityContext:
@@ -688,7 +688,7 @@ spec:
688688
env:
689689
- name: BIN_PATH
690690
value: /opt/cni/bin
691-
image: quay.io/cilium/cilium:v1.15.4
691+
image: quay.io/cilium/cilium:v1.15.6
692692
imagePullPolicy: IfNotPresent
693693
name: apply-sysctl-overwrites
694694
securityContext:
@@ -718,7 +718,7 @@ spec:
718718
value: api.internal.scw-minimal.k8s.local
719719
- name: KUBERNETES_SERVICE_PORT
720720
value: "443"
721-
image: quay.io/cilium/cilium:v1.15.4
721+
image: quay.io/cilium/cilium:v1.15.6
722722
imagePullPolicy: IfNotPresent
723723
name: clean-cilium-state
724724
securityContext:
@@ -735,7 +735,7 @@ spec:
735735
name: cilium-run
736736
- command:
737737
- /install-plugin.sh
738-
image: quay.io/cilium/cilium:v1.15.4
738+
image: quay.io/cilium/cilium:v1.15.6
739739
imagePullPolicy: IfNotPresent
740740
name: install-cni-binaries
741741
resources:
@@ -890,7 +890,7 @@ spec:
890890
value: api.internal.scw-minimal.k8s.local
891891
- name: KUBERNETES_SERVICE_PORT
892892
value: "443"
893-
image: quay.io/cilium/operator:v1.15.4
893+
image: quay.io/cilium/operator:v1.15.6
894894
imagePullPolicy: IfNotPresent
895895
livenessProbe:
896896
httpGet:

‎tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ spec:
220220
sidecarIstioProxyImage: cilium/istio_proxy
221221
toFqdnsDnsRejectResponseCode: refused
222222
tunnel: disabled
223-
version: v1.15.4
223+
version: v1.15.6
224224
nodeTerminationHandler:
225225
cpuRequest: 50m
226226
deleteSQSMsgIfNodeNotFound: false

‎tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content

+1-1
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: 4232331188e8053a0643160ae0776de5de4b083482fd0e86ca7744efc5f90923
102+
manifestHash: 73bb75823f5a80f87197e6fcb8dc72a63ee1c24883175dac77300e6902681161
103103
name: networking.cilium.io
104104
needsRollingUpdate: all
105105
selector:

‎tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content

+7-7
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ spec:
553553
value: api.internal.privatecilium.example.com
554554
- name: KUBERNETES_SERVICE_PORT
555555
value: "443"
556-
image: quay.io/cilium/cilium:v1.15.4
556+
image: quay.io/cilium/cilium:v1.15.6
557557
imagePullPolicy: IfNotPresent
558558
lifecycle:
559559
postStart:
@@ -675,7 +675,7 @@ spec:
675675
value: api.internal.privatecilium.example.com
676676
- name: KUBERNETES_SERVICE_PORT
677677
value: "443"
678-
image: quay.io/cilium/cilium:v1.15.4
678+
image: quay.io/cilium/cilium:v1.15.6
679679
imagePullPolicy: IfNotPresent
680680
name: config
681681
terminationMessagePolicy: FallbackToLogsOnError
@@ -694,7 +694,7 @@ spec:
694694
value: /run/cilium/cgroupv2
695695
- name: BIN_PATH
696696
value: /opt/cni/bin
697-
image: quay.io/cilium/cilium:v1.15.4
697+
image: quay.io/cilium/cilium:v1.15.6
698698
imagePullPolicy: IfNotPresent
699699
name: mount-cgroup
700700
securityContext:
@@ -715,7 +715,7 @@ spec:
715715
env:
716716
- name: BIN_PATH
717717
value: /opt/cni/bin
718-
image: quay.io/cilium/cilium:v1.15.4
718+
image: quay.io/cilium/cilium:v1.15.6
719719
imagePullPolicy: IfNotPresent
720720
name: apply-sysctl-overwrites
721721
securityContext:
@@ -745,7 +745,7 @@ spec:
745745
value: api.internal.privatecilium.example.com
746746
- name: KUBERNETES_SERVICE_PORT
747747
value: "443"
748-
image: quay.io/cilium/cilium:v1.15.4
748+
image: quay.io/cilium/cilium:v1.15.6
749749
imagePullPolicy: IfNotPresent
750750
name: clean-cilium-state
751751
securityContext:
@@ -762,7 +762,7 @@ spec:
762762
name: cilium-run
763763
- command:
764764
- /install-plugin.sh
765-
image: quay.io/cilium/cilium:v1.15.4
765+
image: quay.io/cilium/cilium:v1.15.6
766766
imagePullPolicy: IfNotPresent
767767
name: install-cni-binaries
768768
resources:
@@ -917,7 +917,7 @@ spec:
917917
value: api.internal.privatecilium.example.com
918918
- name: KUBERNETES_SERVICE_PORT
919919
value: "443"
920-
image: quay.io/cilium/operator:v1.15.4
920+
image: quay.io/cilium/operator:v1.15.6
921921
imagePullPolicy: IfNotPresent
922922
livenessProbe:
923923
httpGet:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ spec:
228228
sidecarIstioProxyImage: cilium/istio_proxy
229229
toFqdnsDnsRejectResponseCode: refused
230230
tunnel: vxlan
231-
version: v1.15.4
231+
version: v1.15.6
232232
nodeTerminationHandler:
233233
cpuRequest: 50m
234234
deleteSQSMsgIfNodeNotFound: false

‎tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content

+1-1
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: 7c8b359e91e1a74eb5040f6fb03aff7e1ce3b2ba3398687a905658b7e80bb1be
102+
manifestHash: 12325ce4b4f85d7aa094ccd86197641ff7aff6a90c32da34b64678aa9454a18e
103103
name: networking.cilium.io
104104
needsRollingUpdate: all
105105
selector:

0 commit comments

Comments
 (0)