From a3bf9e41ee25e598e19834eac4d1d91ecefe6e06 Mon Sep 17 00:00:00 2001
From: Ben Konicek <ben.konicek@gmail.com>
Date: Thu, 21 May 2026 13:36:42 -0400
Subject: [PATCH 1/5] Refactor releaseName handling in YAML configuration

Update helm.releaseName logic to allow for simpler overriding
- if `.releaseName` = ".", use the parent directory's name
- if set to another value use that value
- if not set use the default `<cluster-name>-<app-name>`
---
 applications/appset-ops-tools.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/applications/appset-ops-tools.yaml b/applications/appset-ops-tools.yaml
index b59b683..abe3528 100644
--- a/applications/appset-ops-tools.yaml
+++ b/applications/appset-ops-tools.yaml
@@ -43,7 +43,12 @@ spec:
           chart: '{{ .chartName | default .path.basenameNormalized }}'
           {{- end }}
           helm:
-            releaseName: '{{ .releaseName | default (printf "%s-%s" (index .path.segments 1) .path.basenameNormalized) }}'
+            releaseName: >-
+              {{- if hasKey . "releaseName" -}}
+                {{ ternary .path.basenameNormalized .releaseName (eq .releaseName ".") }}
+              {{- else -}}
+                {{ printf "%s-%s" (index .path.segments 1) .path.basenameNormalized }}
+              {{- end -}}
             valueFiles:
               - $values/base/{{ printf "%s.yaml" .path.basenameNormalized }}
               - $values/{{ .path.path }}/values.yaml

From 5e3644205cdfcb1206e57625562180db90ed5aee Mon Sep 17 00:00:00 2001
From: Ben Konicek <ben.konicek@gmail.com>
Date: Thu, 21 May 2026 13:41:23 -0400
Subject: [PATCH 2/5] Fix whitespace trim

---
 applications/appset-ops-tools.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/appset-ops-tools.yaml b/applications/appset-ops-tools.yaml
index abe3528..3e94a55 100644
--- a/applications/appset-ops-tools.yaml
+++ b/applications/appset-ops-tools.yaml
@@ -44,11 +44,11 @@ spec:
           {{- end }}
           helm:
             releaseName: >-
-              {{- if hasKey . "releaseName" -}}
+              {{ if hasKey . "releaseName" }}
                 {{ ternary .path.basenameNormalized .releaseName (eq .releaseName ".") }}
-              {{- else -}}
+              {{ else }}
                 {{ printf "%s-%s" (index .path.segments 1) .path.basenameNormalized }}
-              {{- end -}}
+              {{ end }}
             valueFiles:
               - $values/base/{{ printf "%s.yaml" .path.basenameNormalized }}
               - $values/{{ .path.path }}/values.yaml

From 7a90f9d2c9ce851c13c721419eabb00c9dde21a2 Mon Sep 17 00:00:00 2001
From: Ben Konicek <ben.konicek@gmail.com>
Date: Thu, 21 May 2026 13:45:16 -0400
Subject: [PATCH 3/5] Stick with single line

---
 applications/appset-ops-tools.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/applications/appset-ops-tools.yaml b/applications/appset-ops-tools.yaml
index 3e94a55..7810de1 100644
--- a/applications/appset-ops-tools.yaml
+++ b/applications/appset-ops-tools.yaml
@@ -43,12 +43,7 @@ spec:
           chart: '{{ .chartName | default .path.basenameNormalized }}'
           {{- end }}
           helm:
-            releaseName: >-
-              {{ if hasKey . "releaseName" }}
-                {{ ternary .path.basenameNormalized .releaseName (eq .releaseName ".") }}
-              {{ else }}
-                {{ printf "%s-%s" (index .path.segments 1) .path.basenameNormalized }}
-              {{ end }}
+            releaseName: '{{ if hasKey . "releaseName" }}{{ if eq .releaseName "." }}{{ .path.basenameNormalized }}{{ else }}{{ .releaseName }}{{ end }}{{ else }}{{ printf "%s-%s" (index .path.segments 1) .path.basenameNormalized }}{{ end }}'
             valueFiles:
               - $values/base/{{ printf "%s.yaml" .path.basenameNormalized }}
               - $values/{{ .path.path }}/values.yaml

From b959a864c2d42e87a2dcd6849864c6aa36faee87 Mon Sep 17 00:00:00 2001
From: Ben Konicek <ben.konicek@gmail.com>
Date: Thu, 21 May 2026 13:48:32 -0400
Subject: [PATCH 4/5] test releasename logic

---
 environments/sandbox-oci/tailscale/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments/sandbox-oci/tailscale/config.yaml b/environments/sandbox-oci/tailscale/config.yaml
index c0c9105..3dc3625 100644
--- a/environments/sandbox-oci/tailscale/config.yaml
+++ b/environments/sandbox-oci/tailscale/config.yaml
@@ -1,3 +1,3 @@
 namespace: tailscale
 targetRevision: HEAD
-releaseName: tailscale
+releaseName: foo

From 4733e644d643ed3f6d81d63a44606de2397597a2 Mon Sep 17 00:00:00 2001
From: Ben Konicek <ben.konicek@gmail.com>
Date: Thu, 21 May 2026 13:52:30 -0400
Subject: [PATCH 5/5] test with a less important application

---
 environments/sandbox-oci/local-path-provisioner/config.yaml | 2 +-
 environments/sandbox-oci/tailscale/config.yaml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environments/sandbox-oci/local-path-provisioner/config.yaml b/environments/sandbox-oci/local-path-provisioner/config.yaml
index 83be265..bb5b9be 100644
--- a/environments/sandbox-oci/local-path-provisioner/config.yaml
+++ b/environments/sandbox-oci/local-path-provisioner/config.yaml
@@ -1,5 +1,5 @@
 namespace: local-path-storage
-releaseName: local-path-provisioner
+releaseName: "."
 
 repoURL: oci://ghcr.io/rancher/local-path-provisioner/charts/local-path-provisioner
 targetRevision: 0.0.36
diff --git a/environments/sandbox-oci/tailscale/config.yaml b/environments/sandbox-oci/tailscale/config.yaml
index 3dc3625..c0c9105 100644
--- a/environments/sandbox-oci/tailscale/config.yaml
+++ b/environments/sandbox-oci/tailscale/config.yaml
@@ -1,3 +1,3 @@
 namespace: tailscale
 targetRevision: HEAD
-releaseName: foo
+releaseName: tailscale