Skip to content

Commit aae8652

Browse files
mgfritchmgfritch
authored
Merge pull request #738 from rancher/updatecli_main-source_9f2a1a904b57d2e000d70ce8846ca1c460e9b72a7b72f51e30bc766139ae0d19
Update Cilium version to v1.17.6 and CNI plugins image to v1.7.1-build20250611
2 parents e154c9b + 5c337f5 commit aae8652

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+++ charts/Chart.yaml
33
@@ -81,8 +81,7 @@
44
apiVersion: v2
5-
appVersion: 1.17.5
5+
appVersion: 1.17.6
66
description: eBPF-based Networking, Security, and Observability
77
-home: https://cilium.io/
88
-icon: https://cdn.jsdelivr.net/gh/cilium/cilium@main/Documentation/images/logo-solo.svg
@@ -19,4 +19,4 @@
1919
sources:
2020
-- https://github.com/cilium/cilium
2121
+- https://github.com/rancher/rke2-charts
22-
version: 1.17.5
22+
version: 1.17.6

‎packages/rke2-cilium/generated-changes/patch/values.yaml.patch

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
override: ~
77
- repository: "quay.io/cilium/cilium"
88
+ repository: "rancher/mirrored-cilium-cilium"
9-
tag: "v1.17.5"
9+
tag: "v1.17.6"
1010
pullPolicy: "IfNotPresent"
1111
- # cilium-digest
12-
- digest: "sha256:baf8541723ee0b72d6c489c741c81a6fdc5228940d66cb76ef5ea2ce3c639ea6"
12+
- digest: "sha256:544de3d4fed7acba72758413812780a4972d47c39035f2a06d6145d8644a3353"
1313
- useDigest: true
1414
+ useDigest: false
1515
# -- Scheduling configurations for cilium pods
@@ -27,7 +27,7 @@
2727
# @schema
2828
# type: [null, string]
2929
# @schema
30-
@@ -1118,10 +1119,9 @@
30+
@@ -1115,10 +1116,9 @@
3131
# type: [null, string]
3232
# @schema
3333
override: ~
@@ -40,7 +40,7 @@
4040
pullPolicy: "IfNotPresent"
4141
# -- Seconds after which the completed job pod will be deleted
4242
ttlSecondsAfterFinished: 1800
43-
@@ -1148,7 +1148,7 @@
43+
@@ -1145,7 +1145,7 @@
4444
affinity: {}
4545
hubble:
4646
# -- Enable Hubble (true by default).
@@ -49,21 +49,21 @@
4949
# -- Annotations to be added to all top-level hubble objects (resources under templates/hubble)
5050
annotations: {}
5151
# -- Buffer size of the channel Hubble uses to receive monitor events. If this
52-
@@ -1443,11 +1443,9 @@
52+
@@ -1440,11 +1440,9 @@
5353
# type: [null, string]
5454
# @schema
5555
override: ~
5656
- repository: "quay.io/cilium/hubble-relay"
5757
+ repository: "rancher/mirrored-cilium-hubble-relay"
58-
tag: "v1.17.5"
58+
tag: "v1.17.6"
5959
- # hubble-relay-digest
60-
- digest: "sha256:fbb8a6afa8718200fca9381ad274ed695792dbadd2417b0e99c36210ae4964ff"
60+
- digest: "sha256:7d17ec10b3d37341c18ca56165b2f29a715cb8ee81311fd07088d8bf68c01e60"
6161
- useDigest: true
6262
+ useDigest: false
6363
pullPolicy: "IfNotPresent"
6464
# -- Specifies the resources for the hubble-relay pods
6565
resources: {}
66-
@@ -1612,7 +1610,7 @@
66+
@@ -1609,7 +1607,7 @@
6767
# -- Enable prometheus metrics for hubble-relay on the configured port at
6868
# /metrics
6969
prometheus:
@@ -72,7 +72,7 @@
7272
port: 9966
7373
serviceMonitor:
7474
# -- Enable service monitors.
75-
@@ -1694,10 +1692,9 @@
75+
@@ -1691,10 +1689,9 @@
7676
# type: [null, string]
7777
# @schema
7878
override: ~
@@ -85,7 +85,7 @@
8585
pullPolicy: "IfNotPresent"
8686
# -- Hubble-ui backend security context.
8787
securityContext: {}
88-
@@ -1728,10 +1725,9 @@
88+
@@ -1725,10 +1722,9 @@
8989
# type: [null, string]
9090
# @schema
9191
override: ~
@@ -98,7 +98,7 @@
9898
pullPolicy: "IfNotPresent"
9999
# -- Hubble-ui frontend security context.
100100
securityContext: {}
101-
@@ -1907,7 +1903,7 @@
101+
@@ -1904,7 +1900,7 @@
102102
ipam:
103103
# -- Configure IP Address Management mode.
104104
# ref: https://docs.cilium.io/en/stable/network/concepts/ipam/
@@ -107,7 +107,7 @@
107107
# -- Maximum rate at which the CiliumNode custom resource is updated.
108108
ciliumNodeUpdateRate: "15s"
109109
# -- Pre-allocation settings for IPAM in Multi-Pool mode
110-
@@ -2281,9 +2277,9 @@
110+
@@ -2278,9 +2274,9 @@
111111
# type: [null, boolean]
112112
# @schema
113113
# -- Enable Envoy Proxy in standalone DaemonSet.
@@ -120,41 +120,41 @@
120120
# -- (int)
121121
# Set Envoy'--base-id' to use when allocating shared memory regions.
122122
# Only needs to be changed if multiple Envoy instances will run on the same node and may have conflicts. Supported values: 0 - 4294967295. Defaults to '0'
123-
@@ -2356,11 +2352,10 @@
123+
@@ -2353,11 +2349,10 @@
124124
# type: [null, string]
125125
# @schema
126126
override: ~
127127
- repository: "quay.io/cilium/cilium-envoy"
128128
+ repository: "rancher/mirrored-cilium-cilium-envoy"
129-
tag: "v1.32.6-1749271279-0864395884b263913eac200ee2048fd985f8e626"
129+
tag: "v1.33.4-1752151664-7c2edb0b44cf95f326d628b837fcdd845102ba68"
130130
pullPolicy: "IfNotPresent"
131-
- digest: "sha256:9f69e290a7ea3d4edf9192acd81694089af048ae0d8a67fb63bd62dc1d72203e"
131+
- digest: "sha256:318eff387835ca2717baab42a84f35a83a5f9e7d519253df87269f80b9ff0171"
132132
- useDigest: true
133133
+ useDigest: false
134134
# -- Additional containers added to the cilium Envoy DaemonSet.
135135
extraContainers: []
136136
# -- Additional envoy container arguments.
137-
@@ -2713,17 +2708,9 @@
137+
@@ -2710,17 +2705,9 @@
138138
# type: [null, string]
139139
# @schema
140140
override: ~
141141
- repository: "quay.io/cilium/operator"
142142
+ repository: "rancher/mirrored-cilium-operator"
143-
tag: "v1.17.5"
143+
tag: "v1.17.6"
144144
- # operator-generic-digest
145-
- genericDigest: "sha256:f954c97eeb1b47ed67d08cc8fb4108fb829f869373cbb3e698a7f8ef1085b09e"
145+
- genericDigest: "sha256:91ac3bf7be7bed30e90218f219d4f3062a63377689ee7246062fa0cc3839d096"
146146
- # operator-azure-digest
147-
- azureDigest: "sha256:add78783fdaced7453a324612eeb9ebecf56002b56c14c73596b3b4923321026"
147+
- azureDigest: "sha256:1b7e193ccbc718f723993a0f11eb8fbf16376e822fe8c4dc792d7696701d57c8"
148148
- # operator-aws-digest
149-
- awsDigest: "sha256:3e189ec1e286f1bf23d47c45bdeac6025ef7ec3d2dc16190ee768eb94708cbc3"
149+
- awsDigest: "sha256:24db5c811e24e51e7ce166e8e056967875bf3544cc2ead6984f34f705fe71847"
150150
- # operator-alibabacloud-digest
151-
- alibabacloudDigest: "sha256:654db67929f716b6178a34a15cb8f95e391465085bcf48cdba49819a56fcd259"
151+
- alibabacloudDigest: "sha256:5352e670719dc61f059c1e1a04bc0563c2144738386fa7236dc167ff3fef4c64"
152152
- useDigest: true
153153
+ useDigest: false
154154
pullPolicy: "IfNotPresent"
155155
suffix: ""
156156
# -- Number of replicas to run for the cilium-operator deployment
157-
@@ -2893,8 +2880,7 @@
157+
@@ -2890,8 +2877,7 @@
158158
# @schema
159159
# -- Taint nodes where Cilium is scheduled but not running. This prevents pods
160160
# from being scheduled to nodes where Cilium is not the default CNI provider.
@@ -164,35 +164,35 @@
164164
# -- Set Node condition NetworkUnavailable to 'false' with the reason
165165
# 'CiliumIsUp' for nodes that have a healthy Cilium pod.
166166
setNodeNetworkStatus: true
167-
@@ -2998,11 +2984,9 @@
167+
@@ -2995,11 +2981,9 @@
168168
# type: [null, string]
169169
# @schema
170170
override: ~
171171
- repository: "quay.io/cilium/cilium"
172172
+ repository: "rancher/mirrored-cilium-cilium"
173-
tag: "v1.17.5"
173+
tag: "v1.17.6"
174174
- # cilium-digest
175-
- digest: "sha256:baf8541723ee0b72d6c489c741c81a6fdc5228940d66cb76ef5ea2ce3c639ea6"
175+
- digest: "sha256:544de3d4fed7acba72758413812780a4972d47c39035f2a06d6145d8644a3353"
176176
- useDigest: true
177177
+ useDigest: false
178178
pullPolicy: "IfNotPresent"
179179
# -- The priority class to use for the preflight pod.
180180
priorityClassName: ""
181-
@@ -3147,11 +3131,9 @@
181+
@@ -3144,11 +3128,9 @@
182182
# type: [null, string]
183183
# @schema
184184
override: ~
185185
- repository: "quay.io/cilium/clustermesh-apiserver"
186186
+ repository: "rancher/mirrored-cilium-clustermesh-apiserver"
187-
tag: "v1.17.5"
187+
tag: "v1.17.6"
188188
- # clustermesh-apiserver-digest
189-
- digest: "sha256:78dc40b9cb8d7b1ad21a76ff3e11541809acda2ac4ef94150cc832100edc247d"
189+
- digest: "sha256:f619e97432db427e1511bf91af3be8ded418c53a353a09629e04c5880659d1df"
190190
- useDigest: true
191191
+ useDigest: false
192192
pullPolicy: "IfNotPresent"
193193
# -- TCP port for the clustermesh-apiserver health API.
194194
healthPort: 9880
195-
@@ -3814,3 +3796,11 @@
195+
@@ -3811,3 +3793,11 @@
196196
enableInternalTrafficPolicy: true
197197
# -- Enable LoadBalancer IP Address Management
198198
enableLBIPAM: true

‎packages/rke2-cilium/package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
url: https://helm.cilium.io/cilium-1.17.5.tgz
1+
url: https://helm.cilium.io/cilium-1.17.6.tgz
22
packageVersion: 00

0 commit comments

Comments
 (0)