From e2952f85f136817fabac45fc175203049cbbf574 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <mrostecki@opensuse.org>
Date: Thu, 22 Apr 2021 12:44:34 +0100
Subject: [PATCH] cilium: Update to 1.9.6

This change updates the Cilium version from 1.9.4 to 1.9.6. This release
updates Envoy to 1.17.2 to address CVE-2021-28682, CVE-2021-28683 and
CVE-2021-29258.

Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
---
 packages/cilium/package.yaml            | 4 ++--
 packages/rke2-cilium/charts/Chart.yaml  | 2 +-
 packages/rke2-cilium/charts/values.yaml | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cilium/package.yaml b/packages/cilium/package.yaml
index 32cad84..ee01de8 100644
--- a/packages/cilium/package.yaml
+++ b/packages/cilium/package.yaml
@@ -1,5 +1,5 @@
-url: https://helm.cilium.io/cilium-1.9.4.tgz
-packageVersion: 01
+url: https://helm.cilium.io/cilium-1.9.6.tgz
+packageVersion: 02
 releaseCandidateVersion: 00
 # This package is meant to be consumed as a subchart of another package,
 # not directly.
diff --git a/packages/rke2-cilium/charts/Chart.yaml b/packages/rke2-cilium/charts/Chart.yaml
index 2031aea..d669a93 100644
--- a/packages/rke2-cilium/charts/Chart.yaml
+++ b/packages/rke2-cilium/charts/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: rke2-cilium
 description: eBPF-based Networking, Security, and Observability
-version: 1.9.4
+version: 1.9.6
 kubeVersion: '>= 1.12.0-0'
 home: https://cilium.io/
 keywords:
diff --git a/packages/rke2-cilium/charts/values.yaml b/packages/rke2-cilium/charts/values.yaml
index bc9ff86..69129db 100644
--- a/packages/rke2-cilium/charts/values.yaml
+++ b/packages/rke2-cilium/charts/values.yaml
@@ -6,11 +6,11 @@ cilium:
   imagePullSecrets: []
   image:
     repository: rancher/mirrored-cilium-cilium
-    tag: v1.9.4
+    tag: v1.9.6
   operator:
     image:
       repository: rancher/mirrored-cilium-operator
-      tag: v1.9.4
+      tag: v1.9.6
   nodeinit:
     image:
       repository: rancher/mirrored-cilium-startup-script
@@ -20,7 +20,7 @@ cilium:
     enabled: false
     image:
       repository: rancher/mirrored-cilium-cilium
-      tag: v1.9.4
+      tag: v1.9.6
 
   #
   # Enable Azure integration.