From 9c7144e63d9227c8addb92feeb63a1d19c8bd4e1 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <doug.goldstein@rackspace.com>
Date: Mon, 2 Feb 2026 08:17:27 -0600
Subject: [PATCH 1/2] chore(argocd-understack): re-order values

---
 charts/argocd-understack/values.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/charts/argocd-understack/values.yaml b/charts/argocd-understack/values.yaml
index 4ee5cddfa..23c55b0b3 100644
--- a/charts/argocd-understack/values.yaml
+++ b/charts/argocd-understack/values.yaml
@@ -111,6 +111,13 @@ global:
     # @default -- true
     enabled: true
 
+  # -- OpenEBS
+  openebs:
+    # -- Enable/disable deploying OpenEBS
+    # @default -- true
+    enabled: true
+
+
   # -- OpenStack Resource Controller operator
   openstack_resource_controller:
     # -- Enable/disable deploying OpenStack Resource Controller
@@ -141,12 +148,6 @@ global:
     # @default -- true
     enabled: true
 
-  # -- OpenEBS
-  openebs:
-    # -- Enable/disable deploying OpenEBS
-    # @default -- true
-    enabled: true
-
   # Sealed Secrets operator
   sealed_secrets:
     # -- Enable/disable deploying sealed secrets

From cab2869bdfb6e82c7d784da9f9075c789d378cf2 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <doug.goldstein@rackspace.com>
Date: Mon, 2 Feb 2026 09:35:57 -0600
Subject: [PATCH 2/2] fix(argocd-understack): allow Envoy configs for global
 clusters

When building a global cluster, you will need to still deploy the Envoy
configs.
---
 .../templates/application-envoy-configs.yaml.tpl            | 2 +-
 charts/argocd-understack/values.yaml                        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl b/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
index eebb58b2f..afdbf4cb5 100644
--- a/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
+++ b/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
@@ -1,4 +1,4 @@
-{{- if eq (include "understack.isEnabled" (list $.Values.site "envoy_configs")) "true" }}
+{{- if or (eq (include "understack.isEnabled" (list $.Values.global "envoy_configs")) "true") (eq (include "understack.isEnabled" (list $.Values.site "envoy_configs")) "true") }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
diff --git a/charts/argocd-understack/values.yaml b/charts/argocd-understack/values.yaml
index 23c55b0b3..0ce584b44 100644
--- a/charts/argocd-understack/values.yaml
+++ b/charts/argocd-understack/values.yaml
@@ -57,6 +57,12 @@ global:
     # @default -- true
     enabled: true
 
+  # -- Envoy configs for Envoy Gateway API
+  envoy_configs:
+    # -- Enable/disable deploy Envoy Configs
+    # @default -- true
+    enabled: true
+
   # -- Envoy Gateway API gateway
   envoy_gateway:
     # -- Enable/disable deploying Envoy Gateway