diff --git a/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch b/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch index a5a9b59..1d22176 100644 --- a/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch @@ -2,10 +2,10 @@ +++ charts/Chart.yaml @@ -71,8 +71,7 @@ apiVersion: v2 - appVersion: 1.11.2 + appVersion: 1.11.4 description: eBPF-based Networking, Security, and Observability -home: https://cilium.io/ --icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.11.2/Documentation/images/logo-solo.svg +-icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.11.4/Documentation/images/logo-solo.svg +home: https://docs.rke2.io/ keywords: - BPF @@ -19,4 +19,4 @@ sources: -- https://github.com/cilium/cilium +- https://github.com/rancher/rke2-charts - version: 1.11.2 + version: 1.11.4 diff --git a/packages/rke2-cilium/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rke2-cilium/generated-changes/patch/templates/_helpers.tpl.patch index 324899e..09fbbca 100644 --- a/packages/rke2-cilium/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rke2-cilium/generated-changes/patch/templates/_helpers.tpl.patch @@ -1,6 +1,6 @@ --- charts-original/templates/_helpers.tpl +++ charts/templates/_helpers.tpl -@@ -86,3 +86,11 @@ +@@ -90,3 +90,11 @@ {{- print "batch/v1beta1" -}} {{- end -}} {{- end -}} diff --git a/packages/rke2-cilium/generated-changes/patch/templates/cilium-agent/daemonset.yaml.patch b/packages/rke2-cilium/generated-changes/patch/templates/cilium-agent/daemonset.yaml.patch index a80aa35..85e87c0 100644 --- a/packages/rke2-cilium/generated-changes/patch/templates/cilium-agent/daemonset.yaml.patch +++ b/packages/rke2-cilium/generated-changes/patch/templates/cilium-agent/daemonset.yaml.patch @@ -46,8 +46,8 @@ - sh @@ -390,9 +389,11 @@ volumeMounts: - - name: cilium-bootstrap-file - mountPath: {{ .Values.nodeinit.bootstrapFile }} + - name: cilium-bootstrap-file-dir + mountPath: "/tmp/cilium-bootstrap.d" + securityContext: + privileged: true {{- end }} diff --git a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch index 9de3132..a2e8d31 100644 --- a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch @@ -1,21 +1,21 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -81,12 +81,10 @@ - +@@ -82,12 +82,10 @@ # -- Agent container image. image: + override: ~ - repository: quay.io/cilium/cilium + repository: rancher/mirrored-cilium-cilium - tag: v1.11.2 + tag: v1.11.4 pullPolicy: IfNotPresent - # cilium-digest -- digest: "sha256:4332428fbb528bda32fffe124454458c9b716c86211266d1a03c4ddf695d7f60" +- digest: "sha256:d9d4c7759175db31aa32eaa68274bb9355d468fbc87e23123c80052e3ed63116" - useDigest: true + useDigest: false # -- Pod affinity for cilium-agent. affinity: -@@ -98,12 +96,6 @@ +@@ -99,12 +97,6 @@ operator: In values: - linux @@ -28,7 +28,7 @@ podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: -@@ -561,7 +553,7 @@ +@@ -569,7 +561,7 @@ hubble: # -- Enable Hubble (true by default). @@ -37,7 +37,7 @@ # -- Buffer size of the channel Hubble uses to receive monitor events. If this # value is not set, the queue size is set to the default monitor queue size. -@@ -696,7 +688,8 @@ +@@ -705,7 +697,8 @@ # -- Node labels for pod assignment # ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -47,7 +47,7 @@ # -- Annotations to be added to hubble-relay pods podAnnotations: {} -@@ -866,7 +859,8 @@ +@@ -878,7 +871,8 @@ # -- Node labels for pod assignment # ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -57,7 +57,7 @@ # -- Node tolerations for pod assignment on nodes with taints # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ -@@ -927,7 +921,7 @@ +@@ -939,7 +933,7 @@ ipam: # -- Configure IP Address Management mode. # ref: https://docs.cilium.io/en/stable/concepts/networking/ipam/ @@ -66,7 +66,7 @@ operator: # -- Deprecated in favor of ipam.operator.clusterPoolIPv4PodCIDRList. # IPv4 CIDR range to delegate to individual nodes for IPAM. -@@ -1124,7 +1118,7 @@ +@@ -1136,7 +1130,7 @@ # -- Configure prometheus metrics on the configured port at /metrics prometheus: @@ -75,7 +75,7 @@ port: 9090 serviceMonitor: # -- Enable service monitors. -@@ -1252,7 +1246,8 @@ +@@ -1265,7 +1259,8 @@ # -- Node labels for cilium-etcd-operator pod assignment # ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -85,27 +85,27 @@ # -- Annotations to be added to cilium-etcd-operator pods podAnnotations: {} -@@ -1312,17 +1307,9 @@ - +@@ -1326,17 +1321,9 @@ # -- cilium-operator image. image: + override: ~ - repository: quay.io/cilium/operator + repository: rancher/mirrored-cilium-operator - tag: v1.11.2 + tag: v1.11.4 - # operator-generic-digest -- genericDigest: "sha256:4c8bea6818ee3e4932f99e9c1d7efa88b8c0f3cd516160caec878406531e45e7" +- genericDigest: "sha256:bf75ad0dc47691a3a519b8ab148ed3a792ffa2f1e309e6efa955f30a40e95adc" - # operator-azure-digest -- azureDigest: "sha256:6221ea3e47ae6ad4ab226d7dc886d74ad666e54f50b85863b09d913ae06a497d" +- azureDigest: "sha256:e507e3ece5a3cb45daf2e879bd3888681f297c76523661551ecdd38d8c46c798" - # operator-aws-digest -- awsDigest: "sha256:abb7af69d6679e64dab9d7a87eae73377b3e9b880ff90ab8689ad1bf9e6ff3cd" +- awsDigest: "sha256:3ef7a13d962d977815d12846c04fade989195722ba6628bffaf865fb46d4b6a0" - # operator-alibabacloud-digest -- alibabacloudDigest: "sha256:a4c04d3af0a8b44d66f7fa04361023c082b4a5112bc357f6c9ed95ee5e073213" +- alibabacloudDigest: "sha256:bb6eb1d389d87d435b6ddb7c32955459ccdea15d6542da2bcb38738c8dca15d9" - useDigest: true + useDigest: false pullPolicy: IfNotPresent suffix: "" -@@ -1391,7 +1378,8 @@ +@@ -1405,7 +1392,8 @@ # -- Node labels for cilium-operator pod assignment # ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -115,7 +115,7 @@ # -- Annotations to be added to cilium-operator pods podAnnotations: {} -@@ -1431,7 +1419,7 @@ +@@ -1445,7 +1433,7 @@ # -- Enable prometheus metrics for cilium-operator on the configured port at # /metrics prometheus: @@ -124,7 +124,7 @@ port: 6942 serviceMonitor: # -- Enable service monitors. -@@ -1448,11 +1436,11 @@ +@@ -1462,12 +1450,12 @@ nodeinit: # -- Enable the node initialization DaemonSet @@ -133,12 +133,13 @@ # -- node-init image. image: + override: ~ - repository: quay.io/cilium/startup-script + repository: rancher/mirrored-cilium-startup-script tag: 62bfbe88c17778aad7bef9fa57ff9e2d4a9ba0d8 pullPolicy: IfNotPresent -@@ -1495,7 +1483,8 @@ +@@ -1510,7 +1498,8 @@ # -- Node labels for nodeinit pod assignment # ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -148,21 +149,21 @@ # -- Annotations to be added to node-init pods. podAnnotations: {} -@@ -1530,11 +1519,9 @@ - +@@ -1546,11 +1535,9 @@ # -- Cilium pre-flight image. image: + override: ~ - repository: quay.io/cilium/cilium + repository: rancher/mirrored-cilium-cilium - tag: v1.11.2 + tag: v1.11.4 - # cilium-digest -- digest: "sha256:4332428fbb528bda32fffe124454458c9b716c86211266d1a03c4ddf695d7f60" +- digest: "sha256:d9d4c7759175db31aa32eaa68274bb9355d468fbc87e23123c80052e3ed63116" - useDigest: true + useDigest: false pullPolicy: IfNotPresent # -- The priority class to use for the preflight pod. -@@ -1584,7 +1571,8 @@ +@@ -1600,7 +1587,8 @@ # -- Node labels for preflight pod assignment # ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -172,17 +173,7 @@ # -- Annotations to be added to preflight pods podAnnotations: {} -@@ -1669,7 +1657,8 @@ - - # -- Node labels for pod assignment - # ref: https://kubernetes.io/docs/user-guide/node-selection/ -- nodeSelector: {} -+ nodeSelector: -+ kubernetes.io/os: linux - - # -- Annotations to be added to clustermesh-apiserver pods - podAnnotations: {} -@@ -1795,3 +1784,6 @@ +@@ -1840,3 +1828,6 @@ # -- Configure whether to enable auto detect of terminating state for endpoints # in order to support graceful termination. enableK8sTerminatingEndpoint: true diff --git a/packages/rke2-cilium/package.yaml b/packages/rke2-cilium/package.yaml index 95390cd..c2684ba 100644 --- a/packages/rke2-cilium/package.yaml +++ b/packages/rke2-cilium/package.yaml @@ -1,2 +1,2 @@ -url: https://helm.cilium.io/cilium-1.11.2.tgz -packageVersion: 03 +url: https://helm.cilium.io/cilium-1.11.4.tgz +packageVersion: 01