From c719ab4df108ed308ebc40937371be3f0e221f18 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 15 Feb 2024 13:15:46 -0700 Subject: [PATCH] Update Cilium to v1.15.1 Issue: https://github.com/rancher/rke2/issues/5472 Signed-off-by: Michael Fritch --- .../generated-changes/patch/Chart.yaml.patch | 4 +- .../generated-changes/patch/values.yaml.patch | 38 +++++++++---------- packages/rke2-cilium/package.yaml | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch b/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch index 7ca012a83..fc5f8bbcf 100644 --- a/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-cilium/generated-changes/patch/Chart.yaml.patch @@ -2,7 +2,7 @@ +++ charts/Chart.yaml @@ -81,8 +81,7 @@ apiVersion: v2 - appVersion: 1.15.0 + appVersion: 1.15.1 description: eBPF-based Networking, Security, and Observability -home: https://cilium.io/ -icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.15/Documentation/images/logo-solo.svg @@ -19,4 +19,4 @@ sources: -- https://github.com/cilium/cilium +- https://github.com/rancher/rke2-charts - version: 1.15.0 + version: 1.15.1 diff --git a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch index c55183850..61a188492 100644 --- a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch @@ -6,10 +6,10 @@ override: ~ - repository: "quay.io/cilium/cilium" + repository: "rancher/mirrored-cilium-cilium" - tag: "v1.15.0" + tag: "v1.15.1" pullPolicy: "IfNotPresent" - # cilium-digest -- digest: "sha256:9cfd6a0a3a964780e73a11159f93cc363e616f7d9783608f62af6cfdf3759619" +- digest: "sha256:351d6685dc6f6ffbcd5451043167cfa8842c6decf80d8c8e426a417c73fb56d4" - useDigest: true + useDigest: false @@ -54,9 +54,9 @@ override: ~ - repository: "quay.io/cilium/hubble-relay" + repository: "rancher/mirrored-cilium-hubble-relay" - tag: "v1.15.0" + tag: "v1.15.1" - # hubble-relay-digest -- digest: "sha256:45b3ea70b73aee01644f800b8f6138c36446bfb130d2b88b0f75775ebe6a9ab6" +- digest: "sha256:3254aaf85064bc1567e8ce01ad634b6dd269e91858c83be99e47e685d4bb8012" - useDigest: true + useDigest: false pullPolicy: "IfNotPresent" @@ -68,8 +68,8 @@ override: ~ - repository: "quay.io/cilium/hubble-ui-backend" + repository: "rancher/mirrored-cilium-hubble-ui-backend" - tag: "v0.12.3" -- digest: "sha256:1cd84251cec46e20f9e839ee0afba9b51c8de59d35681234f701d7f42062f138" + tag: "v0.13.0" +- digest: "sha256:1e7657d997c5a48253bb8dc91ecee75b63018d16ff5e5797e5af367336bc8803" - useDigest: true + useDigest: false pullPolicy: "IfNotPresent" @@ -81,8 +81,8 @@ override: ~ - repository: "quay.io/cilium/hubble-ui" + repository: "rancher/mirrored-cilium-hubble-ui" - tag: "v0.12.3" -- digest: "sha256:e6b825302fc1e406b1305363fe0bcd1fdf95730b32c2b99a2b36dfa37bdaeec2" + tag: "v0.13.0" +- digest: "sha256:7d663dc16538dd6e29061abd1047013a645e6e69c115e008bee9ea9fef9a6666" - useDigest: true + useDigest: false pullPolicy: "IfNotPresent" @@ -112,9 +112,9 @@ override: ~ - repository: "quay.io/cilium/cilium-envoy" + repository: "rancher/mirrored-cilium-cilium-envoy" - tag: "v1.27.2-13f6142b9c02268b10d547c8b093ef16724538e3" + tag: "v1.27.3-713b673cccf1af661efd75ca20532336517ddcb9" pullPolicy: "IfNotPresent" -- digest: "sha256:bf37c46d3d6bd5f51ff11d09de81671ced070e27912e080083c58a6d3fbb740f" +- digest: "sha256:a811830c708296194eaf9cee6c1d22c5f8de3544b7eea6cbdfb810326522a4a2" - useDigest: true + useDigest: false @@ -139,15 +139,15 @@ override: ~ - repository: "quay.io/cilium/operator" + repository: "rancher/mirrored-cilium-operator" - tag: "v1.15.0" + tag: "v1.15.1" - # operator-generic-digest -- genericDigest: "sha256:e26ecd316e742e4c8aa1e302ba8b577c2d37d114583d6c4cdd2b638493546a79" +- genericDigest: "sha256:819c7281f5a4f25ee1ce2ec4c76b6fbc69a660c68b7825e9580b1813833fa743" - # operator-azure-digest -- azureDigest: "sha256:498a9e940cddd4e58d401a13005b0784ed9597bfe1e5cf2f52b6ba9ccceee768" +- azureDigest: "sha256:7131758a0a6eb2103c52197eec67769ab339833adbd71f5ede0edafb78e0b587" - # operator-aws-digest -- awsDigest: "sha256:cf45167a8bb336c763046553c6a97c0d7f12f7e2a498dfb2340fa27832a81b3a" +- awsDigest: "sha256:9481ada434ac7c271906d672162c2d70ff87287b229ebb18b86e8af7f757307c" - # operator-alibabacloud-digest -- alibabacloudDigest: "sha256:ee03349caef5519f8e9123132cf17c85b771f8fff095c57f00a2af8bb3224b79" +- alibabacloudDigest: "sha256:9745df85036c9b0deb89065c2bf35df350cfc89284cb0555072c675d2875d5d7" - useDigest: true + useDigest: false pullPolicy: "IfNotPresent" @@ -169,9 +169,9 @@ override: ~ - repository: "quay.io/cilium/cilium" + repository: "rancher/mirrored-cilium-cilium" - tag: "v1.15.0" + tag: "v1.15.1" - # cilium-digest -- digest: "sha256:9cfd6a0a3a964780e73a11159f93cc363e616f7d9783608f62af6cfdf3759619" +- digest: "sha256:351d6685dc6f6ffbcd5451043167cfa8842c6decf80d8c8e426a417c73fb56d4" - useDigest: true + useDigest: false pullPolicy: "IfNotPresent" @@ -183,9 +183,9 @@ override: ~ - repository: "quay.io/cilium/clustermesh-apiserver" + repository: "rancher/mirrored-cilium-clustermesh-apiserver" - tag: "v1.15.0" + tag: "v1.15.1" - # clustermesh-apiserver-digest -- digest: "sha256:43feb49dfbaa82388dc653ce12c7626ce40ae375e9853d71b9f5cff0ce61d54a" +- digest: "sha256:b353badd255c2ce47eaa8f394ee4cbf70666773d7294bd887693e0c33503dc37" - useDigest: true + useDigest: false pullPolicy: "IfNotPresent" diff --git a/packages/rke2-cilium/package.yaml b/packages/rke2-cilium/package.yaml index 9f02b8211..d9b62bddc 100644 --- a/packages/rke2-cilium/package.yaml +++ b/packages/rke2-cilium/package.yaml @@ -1,2 +1,2 @@ -url: https://helm.cilium.io/cilium-1.15.0.tgz +url: https://helm.cilium.io/cilium-1.15.1.tgz packageVersion: 00