From f1f4ef1b2dd517c53c75ea7f17b8bc7149cc18c8 Mon Sep 17 00:00:00 2001
From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Sep 2024 16:00:53 -0600
Subject: [PATCH] Disable cilium envoy by default

Issue: https://github.com/rancher/rke2/issues/6682
Signed-off-by: Michael Fritch <mfritch@suse.com>
---
 .../generated-changes/patch/values.yaml.patch       | 13 +++++++++++++
 packages/rke2-cilium/package.yaml                   |  2 +-
 updatecli/scripts/cilium-values.yaml.patch.template | 13 +++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch
index b5cbe8a..119a4af 100644
--- a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch
+++ b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch
@@ -107,6 +107,19 @@
    port: 9962
    serviceMonitor:
      # -- Enable service monitors.
+@@ -2130,9 +2126,9 @@
+   # type: [null, boolean]
+   # @schema
+   # -- Enable Envoy Proxy in standalone DaemonSet.
+-  # This field is enabled by default for new installation.
+-  # @default -- `true` for new installation
+-  enabled: ~
++  # This field is disabled by default.
++  # @default -- `false`
++  enabled: false
+   # -- (int)
+   # Set Envoy'--base-id' to use when allocating shared memory regions.
+   # Only needs to be changed if multiple Envoy instances will run on the same node and may have conflicts. Supported values: 0 - 4294967295. Defaults to '0'
 @@ -2161,11 +2157,10 @@
      # type: [null, string]
      # @schema
diff --git a/packages/rke2-cilium/package.yaml b/packages/rke2-cilium/package.yaml
index 6e35549..12ce2ce 100644
--- a/packages/rke2-cilium/package.yaml
+++ b/packages/rke2-cilium/package.yaml
@@ -1,2 +1,2 @@
 url: https://helm.cilium.io/cilium-1.16.1.tgz
-packageVersion: 02
+packageVersion: 03
diff --git a/updatecli/scripts/cilium-values.yaml.patch.template b/updatecli/scripts/cilium-values.yaml.patch.template
index dc657df..1861cba 100644
--- a/updatecli/scripts/cilium-values.yaml.patch.template
+++ b/updatecli/scripts/cilium-values.yaml.patch.template
@@ -107,6 +107,19 @@
    port: 9962
    serviceMonitor:
      # -- Enable service monitors.
+@@ -2130,9 +2126,9 @@
+   # type: [null, boolean]
+   # @schema
+   # -- Enable Envoy Proxy in standalone DaemonSet.
+-  # This field is enabled by default for new installation.
+-  # @default -- `true` for new installation
+-  enabled: ~
++  # This field is disabled by default.
++  # @default -- `false`
++  enabled: false
+   # -- (int)
+   # Set Envoy'--base-id' to use when allocating shared memory regions.
+   # Only needs to be changed if multiple Envoy instances will run on the same node and may have conflicts. Supported values: 0 - 4294967295. Defaults to '0'
 @@ -2161,11 +2157,10 @@
      # type: [null, string]
      # @schema