From 81286de9e5bcc77594bad17a1f5eb123f30097ab Mon Sep 17 00:00:00 2001
From: Michal Rostecki <mrostecki@opensuse.org>
Date: Mon, 7 Jun 2021 15:32:31 +0200
Subject: [PATCH] cilium: Update to 1.9.8

Update Cilium from 1.9.6 to 1.9.8. Changelogs of the last two releases:

* https://github.com/cilium/cilium/releases/tag/v1.9.8
* https://github.com/cilium/cilium/releases/tag/v1.9.7

Ref: rancher/rke2#1099
Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
---
 packages/cilium/generated-changes/patch/values.yaml.patch | 2 +-
 packages/cilium/package.yaml                              | 4 ++--
 packages/rke2-cilium/charts/Chart.yaml                    | 2 +-
 packages/rke2-cilium/charts/values.yaml                   | 6 +++---
 packages/rke2-cilium/package.yaml                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cilium/generated-changes/patch/values.yaml.patch b/packages/cilium/generated-changes/patch/values.yaml.patch
index cb33368..8ba3e36 100644
--- a/packages/cilium/generated-changes/patch/values.yaml.patch
+++ b/packages/cilium/generated-changes/patch/values.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -1320,6 +1320,8 @@
+@@ -1325,6 +1325,8 @@
    - effect: NoSchedule
      key: node-role.kubernetes.io/master
    - effect: NoSchedule
diff --git a/packages/cilium/package.yaml b/packages/cilium/package.yaml
index 04c2ac4..b91c927 100644
--- a/packages/cilium/package.yaml
+++ b/packages/cilium/package.yaml
@@ -1,5 +1,5 @@
-url: https://helm.cilium.io/cilium-1.9.6.tgz
-packageVersion: 06
+url: https://helm.cilium.io/cilium-1.9.8.tgz
+packageVersion: 07
 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 d669a93..7ef8c62 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.6
+version: 1.9.8
 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 69129db..9b7e5fb 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.6
+    tag: v1.9.8
   operator:
     image:
       repository: rancher/mirrored-cilium-operator
-      tag: v1.9.6
+      tag: v1.9.8
   nodeinit:
     image:
       repository: rancher/mirrored-cilium-startup-script
@@ -20,7 +20,7 @@ cilium:
     enabled: false
     image:
       repository: rancher/mirrored-cilium-cilium
-      tag: v1.9.6
+      tag: v1.9.8
 
   #
   # Enable Azure integration.
diff --git a/packages/rke2-cilium/package.yaml b/packages/rke2-cilium/package.yaml
index be20a2b..78b9e43 100644
--- a/packages/rke2-cilium/package.yaml
+++ b/packages/rke2-cilium/package.yaml
@@ -1,3 +1,3 @@
 url: local
-packageVersion: 07
+packageVersion: 08
 releaseCandidateVersion: 00