From 755e39291fe209e34d6a152b3562924ce60eddfe Mon Sep 17 00:00:00 2001
From: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com>
Date: Sun, 2 Nov 2025 12:11:05 -0500
Subject: [PATCH 1/2] Revert to use capitalized ENV values for post-build
 substitutions

Signed-off-by: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com>
---
 .../openebs/dynamic-localpv/storageclass.yaml    |  4 ++--
 kustomize/dns/coredns/etcd/certificates.yaml     | 16 ++++++++--------
 .../coredns/patches/helm-release.yaml            |  4 ++--
 .../nginx/loadbalancer/patches/helm-release.yaml |  2 +-
 .../elasticsearch/certificates.yaml              |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/kustomize/csi/openebs/dynamic-localpv/storageclass.yaml b/kustomize/csi/openebs/dynamic-localpv/storageclass.yaml
index 496827e0d..60d7363e9 100644
--- a/kustomize/csi/openebs/dynamic-localpv/storageclass.yaml
+++ b/kustomize/csi/openebs/dynamic-localpv/storageclass.yaml
@@ -9,7 +9,7 @@ metadata:
       - name: StorageType
         value: hostpath
       - name: BasePath
-        value: ${local_volume_path:-/var/local}
+        value: ${LOCAL_VOLUME_PATH:-/var/local}
 provisioner: openebs.io/local
 reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
@@ -25,7 +25,7 @@ metadata:
       - name: StorageType
         value: hostpath
       - name: BasePath
-        value: ${local_volume_path:-/var/local}
+        value: ${LOCAL_VOLUME_PATH:-/var/local}
 provisioner: openebs.io/local
 reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
diff --git a/kustomize/dns/coredns/etcd/certificates.yaml b/kustomize/dns/coredns/etcd/certificates.yaml
index 6101d616a..e69f8aa2e 100644
--- a/kustomize/dns/coredns/etcd/certificates.yaml
+++ b/kustomize/dns/coredns/etcd/certificates.yaml
@@ -11,10 +11,10 @@ spec:
     kind: ClusterIssuer
   commonName: etcd-peer
   dnsNames:
-    - "etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "*.etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "*.etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
+    - "etcd.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "*.etcd.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "*.etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
   usages:
     - digital signature
     - key encipherment
@@ -33,10 +33,10 @@ spec:
     kind: ClusterIssuer
   commonName: etcd
   dnsNames:
-    - "etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "*.etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "*.etcd-headless.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}"
+    - "etcd.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "*.etcd.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "*.etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
   usages:
     - server auth
     - client auth
diff --git a/kustomize/dns/external-dns/coredns/patches/helm-release.yaml b/kustomize/dns/external-dns/coredns/patches/helm-release.yaml
index a6b31b064..257b4427e 100644
--- a/kustomize/dns/external-dns/coredns/patches/helm-release.yaml
+++ b/kustomize/dns/external-dns/coredns/patches/helm-release.yaml
@@ -6,7 +6,7 @@
   path: /spec/values/env/-
   value:
     name: ETCD_URLS
-    value: https://etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}:2379
+    value: https://etcd.system-dns.svc.${DOMAIN:-cluster.local}:2379
 - op: add
   path: /spec/values/env/-
   value:
@@ -26,7 +26,7 @@
   path: /spec/values/env/-
   value:
     name: ETCD_TLS_SERVER_NAME
-    value: etcd.system-dns.svc.${CLUSTER_DOMAIN:-cluster.local}
+    value: etcd.system-dns.svc.${DOMAIN:-cluster.local}
 - op: add
   path: /spec/values/extraVolumes/-
   value:
diff --git a/kustomize/ingress/nginx/loadbalancer/patches/helm-release.yaml b/kustomize/ingress/nginx/loadbalancer/patches/helm-release.yaml
index 5cde31c20..265775b86 100644
--- a/kustomize/ingress/nginx/loadbalancer/patches/helm-release.yaml
+++ b/kustomize/ingress/nginx/loadbalancer/patches/helm-release.yaml
@@ -9,4 +9,4 @@ spec:
     controller:
       service:
         type: LoadBalancer
-        loadBalancerIP: ${loadbalancer_ip}
+        loadBalancerIP: ${LOADBALANCER_IP_START}
diff --git a/kustomize/observability/elasticsearch/certificates.yaml b/kustomize/observability/elasticsearch/certificates.yaml
index ea2b44e4a..f2e649f16 100644
--- a/kustomize/observability/elasticsearch/certificates.yaml
+++ b/kustomize/observability/elasticsearch/certificates.yaml
@@ -14,13 +14,13 @@ spec:
     - "elasticsearch-master"
     - "elasticsearch-master.system-observability"
     - "elasticsearch-master.system-observability.svc"
-    - "elasticsearch-master.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "*.elasticsearch-master.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
+    - "elasticsearch-master.system-observability.svc.${DOMAIN:-cluster.local}"
+    - "*.elasticsearch-master.system-observability.svc.${DOMAIN:-cluster.local}"
     - "elasticsearch-master-headless"
     - "elasticsearch-master-headless.system-observability"
     - "elasticsearch-master-headless.system-observability.svc"
-    - "elasticsearch-master-headless.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
-    - "*.elasticsearch-master-headless.system-observability.svc.${CLUSTER_DOMAIN:-cluster.local}"
+    - "elasticsearch-master-headless.system-observability.svc.${DOMAIN:-cluster.local}"
+    - "*.elasticsearch-master-headless.system-observability.svc.${DOMAIN:-cluster.local}"
   usages:
     - server auth
     - client auth

From b6a2bf77b539e581bf72ec366dced48ccb4dadc3 Mon Sep 17 00:00:00 2001
From: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com>
Date: Sun, 2 Nov 2025 12:53:39 -0500
Subject: [PATCH 2/2] Fix DOMAIN

Signed-off-by: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com>
---
 kustomize/demo/bookinfo/ingress/ingress.yaml     |  2 +-
 kustomize/demo/static/ingress/ingress.yaml       |  2 +-
 kustomize/dns/coredns/etcd/certificates.yaml     | 16 ++++++++--------
 .../coredns/patches/helm-release.yaml            |  4 ++--
 kustomize/dns/external-dns/helm-release.yaml     |  2 +-
 .../route53/patches/helm-release.yaml            |  2 +-
 .../elasticsearch/certificates.yaml              |  8 ++++----
 .../observability/grafana/ingress/ingress.yaml   |  2 +-
 .../observability/kibana/ingress/ingress.yaml    |  2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/kustomize/demo/bookinfo/ingress/ingress.yaml b/kustomize/demo/bookinfo/ingress/ingress.yaml
index 38e3f65ab..d1722d580 100644
--- a/kustomize/demo/bookinfo/ingress/ingress.yaml
+++ b/kustomize/demo/bookinfo/ingress/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: demo-bookinfo
 spec:
   rules:
-  - host: bookinfo.${external_domain:-test}
+  - host: bookinfo.${DOMAIN:-test}
     http:
       paths:
       - path: /
diff --git a/kustomize/demo/static/ingress/ingress.yaml b/kustomize/demo/static/ingress/ingress.yaml
index 212e2beaf..4b6484707 100644
--- a/kustomize/demo/static/ingress/ingress.yaml
+++ b/kustomize/demo/static/ingress/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: demo-static
 spec:
   rules:
-  - host: static.${external_domain:-test}
+  - host: static.${DOMAIN:-test}
     http:
       paths:
       - path: /
diff --git a/kustomize/dns/coredns/etcd/certificates.yaml b/kustomize/dns/coredns/etcd/certificates.yaml
index e69f8aa2e..e5622a84c 100644
--- a/kustomize/dns/coredns/etcd/certificates.yaml
+++ b/kustomize/dns/coredns/etcd/certificates.yaml
@@ -11,10 +11,10 @@ spec:
     kind: ClusterIssuer
   commonName: etcd-peer
   dnsNames:
-    - "etcd.system-dns.svc.${DOMAIN:-cluster.local}"
-    - "*.etcd.system-dns.svc.${DOMAIN:-cluster.local}"
-    - "etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
-    - "*.etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "etcd.system-dns.svc.cluster.local"
+    - "*.etcd.system-dns.svc.cluster.local"
+    - "etcd-headless.system-dns.svc.cluster.local"
+    - "*.etcd-headless.system-dns.svc.cluster.local"
   usages:
     - digital signature
     - key encipherment
@@ -33,10 +33,10 @@ spec:
     kind: ClusterIssuer
   commonName: etcd
   dnsNames:
-    - "etcd.system-dns.svc.${DOMAIN:-cluster.local}"
-    - "*.etcd.system-dns.svc.${DOMAIN:-cluster.local}"
-    - "etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
-    - "*.etcd-headless.system-dns.svc.${DOMAIN:-cluster.local}"
+    - "etcd.system-dns.svc.cluster.local"
+    - "*.etcd.system-dns.svc.cluster.local"
+    - "etcd-headless.system-dns.svc.cluster.local"
+    - "*.etcd-headless.system-dns.svc.cluster.local"
   usages:
     - server auth
     - client auth
diff --git a/kustomize/dns/external-dns/coredns/patches/helm-release.yaml b/kustomize/dns/external-dns/coredns/patches/helm-release.yaml
index 257b4427e..b2e4401f8 100644
--- a/kustomize/dns/external-dns/coredns/patches/helm-release.yaml
+++ b/kustomize/dns/external-dns/coredns/patches/helm-release.yaml
@@ -6,7 +6,7 @@
   path: /spec/values/env/-
   value:
     name: ETCD_URLS
-    value: https://etcd.system-dns.svc.${DOMAIN:-cluster.local}:2379
+    value: https://etcd.system-dns.svc.cluster.local:2379
 - op: add
   path: /spec/values/env/-
   value:
@@ -26,7 +26,7 @@
   path: /spec/values/env/-
   value:
     name: ETCD_TLS_SERVER_NAME
-    value: etcd.system-dns.svc.${DOMAIN:-cluster.local}
+    value: etcd.system-dns.svc.cluster.local
 - op: add
   path: /spec/values/extraVolumes/-
   value:
diff --git a/kustomize/dns/external-dns/helm-release.yaml b/kustomize/dns/external-dns/helm-release.yaml
index 774b6871f..5bc19ae24 100644
--- a/kustomize/dns/external-dns/helm-release.yaml
+++ b/kustomize/dns/external-dns/helm-release.yaml
@@ -23,4 +23,4 @@ spec:
     extraVolumeMounts: []
     sources: []
     domainFilters:
-      - "${external_domain:-test}"
+      - "${DOMAIN:-test}"
diff --git a/kustomize/dns/external-dns/route53/patches/helm-release.yaml b/kustomize/dns/external-dns/route53/patches/helm-release.yaml
index d9d78907d..1b45beb83 100644
--- a/kustomize/dns/external-dns/route53/patches/helm-release.yaml
+++ b/kustomize/dns/external-dns/route53/patches/helm-release.yaml
@@ -24,7 +24,7 @@ spec:
     policy: sync
     registry: txt
     domainFilters:
-      - ${external_domain:-test}
+      - ${DOMAIN:-test}
     serviceAccount:
       create: true
       name: external-dns
diff --git a/kustomize/observability/elasticsearch/certificates.yaml b/kustomize/observability/elasticsearch/certificates.yaml
index f2e649f16..6f3073b28 100644
--- a/kustomize/observability/elasticsearch/certificates.yaml
+++ b/kustomize/observability/elasticsearch/certificates.yaml
@@ -14,13 +14,13 @@ spec:
     - "elasticsearch-master"
     - "elasticsearch-master.system-observability"
     - "elasticsearch-master.system-observability.svc"
-    - "elasticsearch-master.system-observability.svc.${DOMAIN:-cluster.local}"
-    - "*.elasticsearch-master.system-observability.svc.${DOMAIN:-cluster.local}"
+    - "elasticsearch-master.system-observability.svc.cluster.local"
+    - "*.elasticsearch-master.system-observability.svc.cluster.local"
     - "elasticsearch-master-headless"
     - "elasticsearch-master-headless.system-observability"
     - "elasticsearch-master-headless.system-observability.svc"
-    - "elasticsearch-master-headless.system-observability.svc.${DOMAIN:-cluster.local}"
-    - "*.elasticsearch-master-headless.system-observability.svc.${DOMAIN:-cluster.local}"
+    - "elasticsearch-master-headless.system-observability.svc.cluster.local"
+    - "*.elasticsearch-master-headless.system-observability.svc.cluster.local"
   usages:
     - server auth
     - client auth
diff --git a/kustomize/observability/grafana/ingress/ingress.yaml b/kustomize/observability/grafana/ingress/ingress.yaml
index 259a8e5ae..9bc1238d2 100644
--- a/kustomize/observability/grafana/ingress/ingress.yaml
+++ b/kustomize/observability/grafana/ingress/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: system-observability
 spec:
   rules:
-  - host: grafana.${external_domain:-test}
+  - host: grafana.${DOMAIN:-test}
     http:
       paths:
       - path: /
diff --git a/kustomize/observability/kibana/ingress/ingress.yaml b/kustomize/observability/kibana/ingress/ingress.yaml
index 05a826f01..661c3e723 100644
--- a/kustomize/observability/kibana/ingress/ingress.yaml
+++ b/kustomize/observability/kibana/ingress/ingress.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: kibana.${external_domain:-test}
+  - host: kibana.${DOMAIN:-test}
     http:
       paths:
       - path: /