Skip to content

Commit 4366748

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#14586 from olemarkus/cilium-11111
Bump cilium to 1.11.11
2 parents 22368b8 + 5819590 commit 4366748

File tree

22 files changed

+53
-34
lines changed

22 files changed

+53
-34
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.11.8"
43+
c.Version = "v1.11.11"
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
@@ -224,7 +224,7 @@ spec:
224224
sidecarIstioProxyImage: cilium/istio_proxy
225225
toFqdnsDnsRejectResponseCode: refused
226226
tunnel: disabled
227-
version: v1.11.8
227+
version: v1.11.11
228228
nonMasqueradeCIDR: ::/0
229229
secretStore: memfs://clusters.example.com/minimal-ipv6.example.com/secrets
230230
serviceClusterIPRange: fd00:5e4f:ce::/108

‎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
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.16
5050
manifest: networking.cilium.io/k8s-1.16-v1.11.yaml
51-
manifestHash: 885eef8af3ca9960806352dc7d904fec987750df68325dc6f55bfc157248e352
51+
manifestHash: 3caef18f09da33c5404bb35ec52dc684d983410a0d08aad129355d1921598fc3
5252
name: networking.cilium.io
5353
needsRollingUpdate: all
5454
selector:

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ spec:
366366
value: api.internal.minimal-ipv6.example.com
367367
- name: KUBERNETES_SERVICE_PORT
368368
value: "443"
369-
image: quay.io/cilium/cilium:v1.11.8
369+
image: quay.io/cilium/cilium:v1.11.11
370370
imagePullPolicy: IfNotPresent
371371
lifecycle:
372372
postStart:
@@ -424,6 +424,7 @@ spec:
424424
scheme: HTTP
425425
periodSeconds: 2
426426
successThreshold: null
427+
terminationMessagePolicy: FallbackToLogsOnError
427428
volumeMounts:
428429
- mountPath: /sys/fs/bpf
429430
mountPropagation: Bidirectional
@@ -462,7 +463,7 @@ spec:
462463
key: clean-cilium-bpf-state
463464
name: cilium-config
464465
optional: true
465-
image: quay.io/cilium/cilium:v1.11.8
466+
image: quay.io/cilium/cilium:v1.11.11
466467
imagePullPolicy: IfNotPresent
467468
name: clean-cilium-state
468469
resources:
@@ -473,6 +474,7 @@ spec:
473474
memory: 100Mi
474475
securityContext:
475476
privileged: true
477+
terminationMessagePolicy: FallbackToLogsOnError
476478
volumeMounts:
477479
- mountPath: /sys/fs/bpf
478480
name: bpf-maps
@@ -598,7 +600,7 @@ spec:
598600
value: api.internal.minimal-ipv6.example.com
599601
- name: KUBERNETES_SERVICE_PORT
600602
value: "443"
601-
image: quay.io/cilium/operator:v1.11.8
603+
image: quay.io/cilium/operator:v1.11.11
602604
imagePullPolicy: IfNotPresent
603605
livenessProbe:
604606
httpGet:
@@ -614,6 +616,7 @@ spec:
614616
requests:
615617
cpu: 25m
616618
memory: 128Mi
619+
terminationMessagePolicy: FallbackToLogsOnError
617620
volumeMounts:
618621
- mountPath: /tmp/cilium/config-map
619622
name: cilium-config-path

‎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
@@ -189,7 +189,7 @@ ConfigServer:
189189
server: https://kops-controller.internal.minimal-warmpool.example.com:3988/
190190
InstanceGroupName: nodes
191191
InstanceGroupRole: Node
192-
NodeupConfigHash: zTnPdLQKuRBH/rPmzPAsWrCjxqa9sTFsOYhgzYluZak=
192+
NodeupConfigHash: w1YJqDMMv1PJPJCOJEn6Rpkh3sS2VfWtV9EeLmPxBdk=
193193
194194
__EOF_KUBE_ENV
195195

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ spec:
207207
sidecarIstioProxyImage: cilium/istio_proxy
208208
toFqdnsDnsRejectResponseCode: refused
209209
tunnel: vxlan
210-
version: v1.11.8
210+
version: v1.11.11
211211
nonMasqueradeCIDR: 100.64.0.0/10
212212
podCIDR: 100.96.0.0/11
213213
secretStore: memfs://clusters.example.com/minimal-warmpool.example.com/secrets

‎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
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.16
5050
manifest: networking.cilium.io/k8s-1.16-v1.11.yaml
51-
manifestHash: 6e64c69e829725c3a7392cdced0ea1517047848fa966a4a30cb0bc71ba1ace34
51+
manifestHash: 925bfdc2b33c36273d5c2b1589b801bcf8d1d2b789ff5bd2bd80a840e278795a
5252
name: networking.cilium.io
5353
needsRollingUpdate: all
5454
selector:

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ spec:
366366
value: api.internal.minimal-warmpool.example.com
367367
- name: KUBERNETES_SERVICE_PORT
368368
value: "443"
369-
image: quay.io/cilium/cilium:v1.11.8
369+
image: quay.io/cilium/cilium:v1.11.11
370370
imagePullPolicy: IfNotPresent
371371
lifecycle:
372372
postStart:
@@ -424,6 +424,7 @@ spec:
424424
scheme: HTTP
425425
periodSeconds: 2
426426
successThreshold: null
427+
terminationMessagePolicy: FallbackToLogsOnError
427428
volumeMounts:
428429
- mountPath: /sys/fs/bpf
429430
mountPropagation: Bidirectional
@@ -462,7 +463,7 @@ spec:
462463
key: clean-cilium-bpf-state
463464
name: cilium-config
464465
optional: true
465-
image: quay.io/cilium/cilium:v1.11.8
466+
image: quay.io/cilium/cilium:v1.11.11
466467
imagePullPolicy: IfNotPresent
467468
name: clean-cilium-state
468469
resources:
@@ -473,6 +474,7 @@ spec:
473474
memory: 100Mi
474475
securityContext:
475476
privileged: true
477+
terminationMessagePolicy: FallbackToLogsOnError
476478
volumeMounts:
477479
- mountPath: /sys/fs/bpf
478480
name: bpf-maps
@@ -598,7 +600,7 @@ spec:
598600
value: api.internal.minimal-warmpool.example.com
599601
- name: KUBERNETES_SERVICE_PORT
600602
value: "443"
601-
image: quay.io/cilium/operator:v1.11.8
603+
image: quay.io/cilium/operator:v1.11.11
602604
imagePullPolicy: IfNotPresent
603605
livenessProbe:
604606
httpGet:
@@ -614,6 +616,7 @@ spec:
614616
requests:
615617
cpu: 25m
616618
memory: 128Mi
619+
terminationMessagePolicy: FallbackToLogsOnError
617620
volumeMounts:
618621
- mountPath: /tmp/cilium/config-map
619622
name: cilium-config-path

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ containerdConfig:
4747
logLevel: info
4848
version: 1.4.13
4949
warmPoolImages:
50-
- quay.io/cilium/cilium:v1.11.8
51-
- quay.io/cilium/operator:v1.11.8
50+
- quay.io/cilium/cilium:v1.11.11
51+
- quay.io/cilium/operator:v1.11.11
5252
- registry.k8s.io/kube-proxy:v1.21.0
5353
- registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.12.0
5454
- registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ spec:
197197
sidecarIstioProxyImage: cilium/istio_proxy
198198
toFqdnsDnsRejectResponseCode: refused
199199
tunnel: vxlan
200-
version: v1.11.8
200+
version: v1.11.11
201201
nonMasqueradeCIDR: 100.64.0.0/10
202202
podCIDR: 100.96.0.0/11
203203
secretStore: memfs://clusters.example.com/privatecilium.example.com/secrets

‎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
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.16
5050
manifest: networking.cilium.io/k8s-1.16-v1.11.yaml
51-
manifestHash: b3dc5c75dba840f3a254ea92e2625a15b7eb5a1620c3cdc7a2388171a4f5dbd3
51+
manifestHash: b8e6ace39f88ef81ca852eb08adc0f0fa294449c3387849a5a8b5808ad08207b
5252
name: networking.cilium.io
5353
needsRollingUpdate: all
5454
selector:

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ spec:
370370
value: api.internal.privatecilium.example.com
371371
- name: KUBERNETES_SERVICE_PORT
372372
value: "443"
373-
image: quay.io/cilium/cilium:v1.11.8
373+
image: quay.io/cilium/cilium:v1.11.11
374374
imagePullPolicy: IfNotPresent
375375
lifecycle:
376376
postStart:
@@ -428,6 +428,7 @@ spec:
428428
scheme: HTTP
429429
periodSeconds: 2
430430
successThreshold: null
431+
terminationMessagePolicy: FallbackToLogsOnError
431432
volumeMounts:
432433
- mountPath: /sys/fs/bpf
433434
mountPropagation: Bidirectional
@@ -466,7 +467,7 @@ spec:
466467
key: clean-cilium-bpf-state
467468
name: cilium-config
468469
optional: true
469-
image: quay.io/cilium/cilium:v1.11.8
470+
image: quay.io/cilium/cilium:v1.11.11
470471
imagePullPolicy: IfNotPresent
471472
name: clean-cilium-state
472473
resources:
@@ -477,6 +478,7 @@ spec:
477478
memory: 100Mi
478479
securityContext:
479480
privileged: true
481+
terminationMessagePolicy: FallbackToLogsOnError
480482
volumeMounts:
481483
- mountPath: /sys/fs/bpf
482484
name: bpf-maps
@@ -602,7 +604,7 @@ spec:
602604
value: api.internal.privatecilium.example.com
603605
- name: KUBERNETES_SERVICE_PORT
604606
value: "443"
605-
image: quay.io/cilium/operator:v1.11.8
607+
image: quay.io/cilium/operator:v1.11.11
606608
imagePullPolicy: IfNotPresent
607609
livenessProbe:
608610
httpGet:
@@ -618,6 +620,7 @@ spec:
618620
requests:
619621
cpu: 25m
620622
memory: 128Mi
623+
terminationMessagePolicy: FallbackToLogsOnError
621624
volumeMounts:
622625
- mountPath: /tmp/cilium/config-map
623626
name: cilium-config-path

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ spec:
222222
sidecarIstioProxyImage: cilium/istio_proxy
223223
toFqdnsDnsRejectResponseCode: refused
224224
tunnel: vxlan
225-
version: v1.11.8
225+
version: v1.11.11
226226
nonMasqueradeCIDR: 100.64.0.0/10
227227
podCIDR: 100.96.0.0/11
228228
secretStore: memfs://clusters.example.com/privatecilium.example.com/secrets

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
version: 9.99.0
6262
- id: k8s-1.16
6363
manifest: networking.cilium.io/k8s-1.16-v1.11.yaml
64-
manifestHash: b3acce4adc999d84807deebdc166709c2df1879e69c944b09fd63f18ba8acd2d
64+
manifestHash: e2e5c9b1c0641e661bedfa24749597167be409d1e13e4511c62b68af88f09dc5
6565
name: networking.cilium.io
6666
needsPKI: true
6767
needsRollingUpdate: all

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ spec:
477477
value: api.internal.privatecilium.example.com
478478
- name: KUBERNETES_SERVICE_PORT
479479
value: "443"
480-
image: quay.io/cilium/cilium:v1.11.8
480+
image: quay.io/cilium/cilium:v1.11.11
481481
imagePullPolicy: IfNotPresent
482482
lifecycle:
483483
postStart:
@@ -535,6 +535,7 @@ spec:
535535
scheme: HTTP
536536
periodSeconds: 2
537537
successThreshold: null
538+
terminationMessagePolicy: FallbackToLogsOnError
538539
volumeMounts:
539540
- mountPath: /sys/fs/bpf
540541
mountPropagation: Bidirectional
@@ -576,7 +577,7 @@ spec:
576577
key: clean-cilium-bpf-state
577578
name: cilium-config
578579
optional: true
579-
image: quay.io/cilium/cilium:v1.11.8
580+
image: quay.io/cilium/cilium:v1.11.11
580581
imagePullPolicy: IfNotPresent
581582
name: clean-cilium-state
582583
resources:
@@ -587,6 +588,7 @@ spec:
587588
memory: 100Mi
588589
securityContext:
589590
privileged: true
591+
terminationMessagePolicy: FallbackToLogsOnError
590592
volumeMounts:
591593
- mountPath: /sys/fs/bpf
592594
name: bpf-maps
@@ -716,7 +718,7 @@ spec:
716718
value: api.internal.privatecilium.example.com
717719
- name: KUBERNETES_SERVICE_PORT
718720
value: "443"
719-
image: quay.io/cilium/operator:v1.11.8
721+
image: quay.io/cilium/operator:v1.11.11
720722
imagePullPolicy: IfNotPresent
721723
livenessProbe:
722724
httpGet:
@@ -732,6 +734,7 @@ spec:
732734
requests:
733735
cpu: 25m
734736
memory: 128Mi
737+
terminationMessagePolicy: FallbackToLogsOnError
735738
volumeMounts:
736739
- mountPath: /tmp/cilium/config-map
737740
name: cilium-config-path
@@ -803,7 +806,7 @@ spec:
803806
env:
804807
- name: GODEBUG
805808
value: x509ignoreCN=0
806-
image: quay.io/cilium/hubble-relay:v1.11.8
809+
image: quay.io/cilium/hubble-relay:v1.11.11
807810
imagePullPolicy: IfNotPresent
808811
livenessProbe:
809812
tcpSocket:
@@ -815,6 +818,7 @@ spec:
815818
readinessProbe:
816819
tcpSocket:
817820
port: grpc
821+
terminationMessagePolicy: FallbackToLogsOnError
818822
volumeMounts:
819823
- mountPath: /var/run/cilium
820824
name: hubble-sock-dir

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ spec:
203203
sidecarIstioProxyImage: cilium/istio_proxy
204204
toFqdnsDnsRejectResponseCode: refused
205205
tunnel: disabled
206-
version: v1.11.8
206+
version: v1.11.11
207207
nonMasqueradeCIDR: 100.64.0.0/10
208208
podCIDR: 100.96.0.0/11
209209
secretStore: memfs://clusters.example.com/privateciliumadvanced.example.com/secrets

‎tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
version: 9.99.0
4949
- id: k8s-1.16
5050
manifest: networking.cilium.io/k8s-1.16-v1.11.yaml
51-
manifestHash: 7599559ab676fd5770f5fc352c0e8826c25487fc6d30e4747766eae256494fb8
51+
manifestHash: e4a99245537437ec9596da5feea66740b45d873c840ae3b7dc917884cda582eb
5252
name: networking.cilium.io
5353
needsRollingUpdate: all
5454
selector:

‎tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-networking.cilium.io-k8s-1.16_content

+6-3
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ spec:
380380
value: api.internal.privateciliumadvanced.example.com
381381
- name: KUBERNETES_SERVICE_PORT
382382
value: "443"
383-
image: quay.io/cilium/cilium:v1.11.8
383+
image: quay.io/cilium/cilium:v1.11.11
384384
imagePullPolicy: IfNotPresent
385385
lifecycle:
386386
postStart:
@@ -438,6 +438,7 @@ spec:
438438
scheme: HTTP
439439
periodSeconds: 2
440440
successThreshold: null
441+
terminationMessagePolicy: FallbackToLogsOnError
441442
volumeMounts:
442443
- mountPath: /sys/fs/bpf
443444
mountPropagation: Bidirectional
@@ -482,7 +483,7 @@ spec:
482483
key: clean-cilium-bpf-state
483484
name: cilium-config
484485
optional: true
485-
image: quay.io/cilium/cilium:v1.11.8
486+
image: quay.io/cilium/cilium:v1.11.11
486487
imagePullPolicy: IfNotPresent
487488
name: clean-cilium-state
488489
resources:
@@ -493,6 +494,7 @@ spec:
493494
memory: 100Mi
494495
securityContext:
495496
privileged: true
497+
terminationMessagePolicy: FallbackToLogsOnError
496498
volumeMounts:
497499
- mountPath: /sys/fs/bpf
498500
name: bpf-maps
@@ -629,7 +631,7 @@ spec:
629631
value: api.internal.privateciliumadvanced.example.com
630632
- name: KUBERNETES_SERVICE_PORT
631633
value: "443"
632-
image: quay.io/cilium/operator:v1.11.8
634+
image: quay.io/cilium/operator:v1.11.11
633635
imagePullPolicy: IfNotPresent
634636
livenessProbe:
635637
httpGet:
@@ -645,6 +647,7 @@ spec:
645647
requests:
646648
cpu: 25m
647649
memory: 128Mi
650+
terminationMessagePolicy: FallbackToLogsOnError
648651
volumeMounts:
649652
- mountPath: /tmp/cilium/config-map
650653
name: cilium-config-path

0 commit comments

Comments
 (0)