Skip to content

Commit 0ded950

Browse files
committed
Update default Cilium Helm chart version to 1.17.19
Note that Cilium 1.17 introduces the `cilium-secrets` namespace which is configured as the source namespace for secrets associated with the dedicated envoy daemonset.
1 parent 06840b9 commit 0ded950

File tree

116 files changed

+2126
-208
lines changed

Some content is hidden

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

116 files changed

+2126
-208
lines changed

class/defaults.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ parameters:
144144
charts:
145145
cilium:
146146
source: https://helm.cilium.io
147-
version: "1.16.4"
147+
version: "1.17.9"
148148
cilium-enterprise:
149149
source: "<CILIUM-ENTERPRISE-CHART-REPO-URL>" # Configure the Chart repository URL in your global defaults
150-
version: "1.16.4"
150+
version: "1.17.9"
151151

152152
images:
153153
oc:

docs/modules/ROOT/pages/references/parameters.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:helm-minor-version: v1.16
1+
:current-minor-version: v1.17
22

33
= Parameters
44

@@ -191,7 +191,7 @@ type:: object
191191
default:: https://github.com/projectsyn/component-cilium/blob/master/class/defaults.yml[See `class/defaults.yml`]
192192

193193
The configuration values of the underlying Cilium helm chart.
194-
See https://docs.cilium.io/en/{helm-minor-version}/helm-reference/[Opensource Cilium documentation] for supported values.
194+
See https://docs.cilium.io/en/{current-minor-version}/helm-reference/[Opensource Cilium documentation] for supported values.
195195

196196
The component will pre-process certain Helm values to allow users to more gracefully upgrade to newer Cilium versions which remove deprecated Helm values.
197197

@@ -268,7 +268,7 @@ l7Proxy: false
268268
----
269269

270270
Notably, the L7 proxy feature is disabled by default when egress gateway policies are enabled.
271-
This is recommended by the Cilium documentation, see also https://docs.cilium.io/en/{helm-minor-version}/network/egress-gateway/#incompatibility-with-other-features[the upstream documentation].
271+
This is recommended by the Cilium documentation, see also https://docs.cilium.io/en/{current-minor-version}/network/egress-gateway/#incompatibility-with-other-features[the upstream documentation].
272272

273273
Additionally, BPF masquerading can't be disabled when the egress gateway feature is enabled.
274274

@@ -441,7 +441,7 @@ The component's support for configuring BGP egress IPs through `egress_ip_ranges
441441
Announcing egress IPs via BGP is only supported in Isovalent Networking for Kubernetes.
442442
443443
When the field is provided, and not an empty object, the component adds the contents as entries in `metadata.labels` of the resulting policies.
444-
In this case, the component configures the egress policies with https://docs.isovalent.com/v1.16/configuration-guide/networking/egress-gateway/introduction.html#requirements-for-egress-ip-and-ipam-feature[Cilium's Egress Gateawy IPAM] and `maxGatewayNodes: 1` in the `spec.egressGroups` entry.
444+
In this case, the component configures the egress policies with https://docs.isovalent.com/{current-minor-version}/configuration-guide/networking/egress-gateway/introduction.html#requirements-for-egress-ip-and-ipam-feature[Cilium's Egress Gateawy IPAM] and `maxGatewayNodes: 1` in the `spec.egressGroups` entry.
445445
446446
Please note that policies which use EGW IPAM will ignore static routes on the active gateway node (as of Cilium 1.16.16 and Cilium 1.17.9).
447447
@@ -767,7 +767,7 @@ default:: `false`
767767

768768
Whether to enable the BGP control plane feature in Cilium.
769769

770-
See the https://docs.cilium.io/en/{helm-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/[upstream BGP control plane documentation] for details on the architecture and the individual custom resources mentioned in this section.
770+
See the https://docs.cilium.io/en/{current-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/[upstream BGP control plane documentation] for details on the architecture and the individual custom resources mentioned in this section.
771771

772772
=== `bgp.enterprise`
773773

@@ -816,7 +816,7 @@ Field `spec` is merged over the partial object generated from fields `nodeSelect
816816

817817
The component validates that `CiliumBGPClusterConfig` resources only reference `CiliumBGPPeerConfig` resources which are defined in parameter `bgp.peer_configs`.
818818

819-
See the https://docs.cilium.io/en/{helm-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#bgp-cluster-configuration[upstream documentation] for all available configuration options.
819+
See the https://docs.cilium.io/en/{current-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#bgp-cluster-configuration[upstream documentation] for all available configuration options.
820820

821821

822822
==== Example
@@ -898,7 +898,7 @@ Field `spec` is merged over the partial object created from field `families`.
898898

899899
The component validates that `CiliumBGPPeerConfig` resources only reference BGP auth secret `Secret` resources which are defined in parameter `bgp.auth_secrets`.
900900

901-
See the https://docs.cilium.io/en/{helm-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#bgp-peer-configuration[upstream documentation] for details.
901+
See the https://docs.cilium.io/en/{current-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#bgp-peer-configuration[upstream documentation] for details.
902902

903903
==== Example
904904

@@ -962,7 +962,7 @@ The namespace can be changed by setting Helm value `bgpControlPlane.secretsNames
962962

963963
The component sets `metadata.namespace` to the configured `bgpControlPlane.secretsNamspace.name` for secrets defined through this parameter.
964964

965-
See the https://docs.cilium.io/en/v1.16/network/bgp-control-plane/bgp-control-plane-v2/#md5-password[upstream documentation] for details.
965+
See the https://docs.cilium.io/en/{current-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#md5-password[upstream documentation] for details.
966966

967967
=== `bgp.node_config_overrides`
968968

@@ -978,7 +978,7 @@ The component creates one `CiliumBGPNodeConfigOverride` for each entry in this p
978978
The key is used as `metadata.name` of the resulting object.
979979
The component expects that each value in this parameter is a valid partial `CiliumBGPNodeConfigOverride` resource and doesn't apply any processing.
980980

981-
See the https://docs.cilium.io/en/v1.16/network/bgp-control-plane/bgp-control-plane-v2/#bgp-configuration-override[upstream documentation] for details.
981+
See the https://docs.cilium.io/en/{current-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#bgp-configuration-override[upstream documentation] for details.
982982

983983
NOTE: The resource name must match the Kubernetes node name of the node for which the configuration is intended.
984984

@@ -997,7 +997,7 @@ The component supports fields `metadata` and `advertisements` for each entry of
997997
Field `metadata` is added to the resulting resource as is.
998998
Field `advertisements` is expected to be an object, and the values of the object are used for field `spec.advertisements` in the resulting resource without further processing.
999999

1000-
See the https://docs.cilium.io/en/v1.16/network/bgp-control-plane/bgp-control-plane-v2/#bgp-advertisements[upstream documentation] for details.
1000+
See the https://docs.cilium.io/en/{current-minor-version}/network/bgp-control-plane/bgp-control-plane-v2/#bgp-advertisements[upstream documentation] for details.
10011001

10021002
NOTE: The resource name must match the Kubernetes node name of the node for which the configuration is intended.
10031003

tests/golden/bgp-control-plane/cilium/cilium/01_cilium_helmchart/cilium/templates/cilium-agent/daemonset.yaml

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ spec:
5454
resourceFieldRef:
5555
divisor: '1'
5656
resource: limits.memory
57-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
57+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
5858
imagePullPolicy: IfNotPresent
5959
lifecycle:
6060
postStart:
@@ -93,6 +93,8 @@ spec:
9393
httpHeaders:
9494
- name: brief
9595
value: 'true'
96+
- name: require-k8s-connectivity
97+
value: 'false'
9698
path: /healthz
9799
port: 9879
98100
scheme: HTTP
@@ -109,14 +111,6 @@ spec:
109111
hostPort: 9962
110112
name: prometheus
111113
protocol: TCP
112-
- containerPort: 9964
113-
hostPort: 9964
114-
name: envoy-metrics
115-
protocol: TCP
116-
- containerPort: 9901
117-
hostPort: 9901
118-
name: envoy-admin
119-
protocol: TCP
120114
- containerPort: 9965
121115
hostPort: 9965
122116
name: hubble-metrics
@@ -169,6 +163,9 @@ spec:
169163
successThreshold: 1
170164
terminationMessagePolicy: FallbackToLogsOnError
171165
volumeMounts:
166+
- mountPath: /var/run/cilium/envoy/sockets
167+
name: envoy-sockets
168+
readOnly: false
172169
- mountPath: /host/proc/sys/net
173170
name: host-proc-sys-net
174171
- mountPath: /host/proc/sys/kernel
@@ -178,6 +175,9 @@ spec:
178175
name: bpf-maps
179176
- mountPath: /var/run/cilium
180177
name: cilium-run
178+
- mountPath: /var/run/cilium/netns
179+
mountPropagation: HostToContainer
180+
name: cilium-netns
181181
- mountPath: /host/etc/cni/net.d
182182
name: etc-cni-netd
183183
- mountPath: /var/lib/cilium/clustermesh
@@ -206,7 +206,7 @@ spec:
206206
fieldRef:
207207
apiVersion: v1
208208
fieldPath: metadata.namespace
209-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
209+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
210210
imagePullPolicy: IfNotPresent
211211
name: config
212212
terminationMessagePolicy: FallbackToLogsOnError
@@ -225,7 +225,7 @@ spec:
225225
value: /run/cilium/cgroupv2
226226
- name: BIN_PATH
227227
value: /var/lib/cni/bin
228-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
228+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
229229
imagePullPolicy: IfNotPresent
230230
name: mount-cgroup
231231
securityContext:
@@ -255,7 +255,7 @@ spec:
255255
env:
256256
- name: BIN_PATH
257257
value: /var/lib/cni/bin
258-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
258+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
259259
imagePullPolicy: IfNotPresent
260260
name: apply-sysctl-overwrites
261261
securityContext:
@@ -281,7 +281,7 @@ spec:
281281
- /bin/bash
282282
- -c
283283
- --
284-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
284+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
285285
imagePullPolicy: IfNotPresent
286286
name: mount-bpf-fs
287287
securityContext:
@@ -312,7 +312,7 @@ spec:
312312
key: write-cni-conf-when-ready
313313
name: cilium-config
314314
optional: true
315-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
315+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
316316
imagePullPolicy: IfNotPresent
317317
name: clean-cilium-state
318318
securityContext:
@@ -338,7 +338,7 @@ spec:
338338
name: cilium-run
339339
- command:
340340
- /install-plugin.sh
341-
image: quay.io/cilium/cilium:v1.16.4@sha256:d55ec38938854133e06739b1af237932b9c4dd4e75e9b7b2ca3acc72540a44bf
341+
image: quay.io/cilium/cilium:v1.17.9@sha256:6792747da10f8daf2ae7f028713bc4f4cff335451fa70bfb211557e95cb1e6a5
342342
imagePullPolicy: IfNotPresent
343343
name: install-cni-binaries
344344
resources:
@@ -360,6 +360,9 @@ spec:
360360
kubernetes.io/os: linux
361361
priorityClassName: system-node-critical
362362
restartPolicy: Always
363+
securityContext:
364+
seccompProfile:
365+
type: Unconfined
363366
serviceAccountName: cilium
364367
terminationGracePeriodSeconds: 1
365368
tolerations:
@@ -371,6 +374,10 @@ spec:
371374
path: /var/run/cilium
372375
type: DirectoryOrCreate
373376
name: cilium-run
377+
- hostPath:
378+
path: /var/run/netns
379+
type: DirectoryOrCreate
380+
name: cilium-netns
374381
- hostPath:
375382
path: /sys/fs/bpf
376383
type: DirectoryOrCreate
@@ -398,6 +405,10 @@ spec:
398405
path: /run/xtables.lock
399406
type: FileOrCreate
400407
name: xtables-lock
408+
- hostPath:
409+
path: /var/run/cilium/envoy/sockets
410+
type: DirectoryOrCreate
411+
name: envoy-sockets
401412
- name: clustermesh-secrets
402413
projected:
403414
defaultMode: 256

tests/golden/bgp-control-plane/cilium/cilium/01_cilium_helmchart/cilium/templates/cilium-agent/role.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,20 @@ rules:
3131
- get
3232
- list
3333
- watch
34+
---
35+
apiVersion: rbac.authorization.k8s.io/v1
36+
kind: Role
37+
metadata:
38+
labels:
39+
app.kubernetes.io/part-of: cilium
40+
name: cilium-tlsinterception-secrets
41+
namespace: cilium-secrets
42+
rules:
43+
- apiGroups:
44+
- ''
45+
resources:
46+
- secrets
47+
verbs:
48+
- get
49+
- list
50+
- watch

tests/golden/bgp-control-plane/cilium/cilium/01_cilium_helmchart/cilium/templates/cilium-agent/rolebinding.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,19 @@ subjects:
2929
- kind: ServiceAccount
3030
name: cilium
3131
namespace: cilium
32+
---
33+
apiVersion: rbac.authorization.k8s.io/v1
34+
kind: RoleBinding
35+
metadata:
36+
labels:
37+
app.kubernetes.io/part-of: cilium
38+
name: cilium-tlsinterception-secrets
39+
namespace: cilium-secrets
40+
roleRef:
41+
apiGroup: rbac.authorization.k8s.io
42+
kind: Role
43+
name: cilium-tlsinterception-secrets
44+
subjects:
45+
- kind: ServiceAccount
46+
name: cilium
47+
namespace: cilium

tests/golden/bgp-control-plane/cilium/cilium/01_cilium_helmchart/cilium/templates/cilium-agent/service.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ spec:
1414
port: 9962
1515
protocol: TCP
1616
targetPort: prometheus
17-
- name: envoy-metrics
18-
port: 9964
19-
protocol: TCP
20-
targetPort: envoy-metrics
2117
selector:
2218
k8s-app: cilium
2319
type: ClusterIP

tests/golden/bgp-control-plane/cilium/cilium/01_cilium_helmchart/cilium/templates/cilium-agent/servicemonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ spec:
2121
- cilium
2222
selector:
2323
matchLabels:
24-
k8s-app: cilium
24+
app.kubernetes.io/name: cilium-agent
2525
targetLabels:
2626
- k8s-app

0 commit comments

Comments
 (0)