From dd80abe622fd824b8af358a8923d6fb47715825d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Tue, 10 Sep 2024 12:34:14 +0200
Subject: [PATCH] fix(helmfile): Add `sample.yaml.gotmpl` to `dev` and `prod`
 env directories.

---
 .gitignore                                           |  2 ++
 helmfile/environments/dev/sample.yaml.gotmpl         | 11 +++++++++++
 helmfile/environments/dev/values.yaml.gotmpl.sample  |  8 --------
 helmfile/environments/prod/sample.yaml.gotmpl        | 11 +++++++++++
 helmfile/environments/prod/values.yaml.gotmpl.sample |  8 --------
 helmfile/environments/test/sample.yaml.gotmpl        | 11 +++++++++++
 helmfile/environments/test/values.yaml.gotmpl.sample |  8 --------
 7 files changed, 35 insertions(+), 24 deletions(-)
 create mode 100644 helmfile/environments/dev/sample.yaml.gotmpl
 delete mode 100644 helmfile/environments/dev/values.yaml.gotmpl.sample
 create mode 100644 helmfile/environments/prod/sample.yaml.gotmpl
 delete mode 100644 helmfile/environments/prod/values.yaml.gotmpl.sample
 create mode 100644 helmfile/environments/test/sample.yaml.gotmpl
 delete mode 100644 helmfile/environments/test/values.yaml.gotmpl.sample

diff --git a/.gitignore b/.gitignore
index f8d85015..42c54807 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 # Ignore changes to sample environments
 helmfile/environments/dev/*.yaml.gotmpl
 helmfile/environments/prod/*.yaml.gotmpl
+!helmfile/environments/dev/sample.yaml.gotmpl
+!helmfile/environments/prod/sample.yaml.gotmpl
 
 # Ignore in CI generated files
 .kyverno/opendesk.yaml
diff --git a/helmfile/environments/dev/sample.yaml.gotmpl b/helmfile/environments/dev/sample.yaml.gotmpl
new file mode 100644
index 00000000..211ce11f
--- /dev/null
+++ b/helmfile/environments/dev/sample.yaml.gotmpl
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0
+#
+# NOTE: Do not overwrite this file!
+# Place `.yaml.gotmpl` file(s) with your dev environment specific settings into this folder.
+# As shown in the example you can even use templating.
+---
+sample:
+  withTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
+  withoutTemplating: "my_value"
+...
diff --git a/helmfile/environments/dev/values.yaml.gotmpl.sample b/helmfile/environments/dev/values.yaml.gotmpl.sample
deleted file mode 100644
index 0c4eb810..00000000
--- a/helmfile/environments/dev/values.yaml.gotmpl.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
----
-sampleWithTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
-global:
-  imageRegistry: "your.private.oci-container-image-registry/with_optional_path"
-  helmRegistry: "your.private.oci-helm-chart-registry/with_optional_path"
-...
diff --git a/helmfile/environments/prod/sample.yaml.gotmpl b/helmfile/environments/prod/sample.yaml.gotmpl
new file mode 100644
index 00000000..d8f30d78
--- /dev/null
+++ b/helmfile/environments/prod/sample.yaml.gotmpl
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0
+#
+# NOTE: Do not overwrite this file!
+# Place `.yaml.gotmpl` file(s) with your prod environment specific settings into this folder.
+# As shown in the example you can even use templating.
+---
+sample:
+  withTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
+  withoutTemplating: "my_value"
+...
diff --git a/helmfile/environments/prod/values.yaml.gotmpl.sample b/helmfile/environments/prod/values.yaml.gotmpl.sample
deleted file mode 100644
index 0c4eb810..00000000
--- a/helmfile/environments/prod/values.yaml.gotmpl.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
----
-sampleWithTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
-global:
-  imageRegistry: "your.private.oci-container-image-registry/with_optional_path"
-  helmRegistry: "your.private.oci-helm-chart-registry/with_optional_path"
-...
diff --git a/helmfile/environments/test/sample.yaml.gotmpl b/helmfile/environments/test/sample.yaml.gotmpl
new file mode 100644
index 00000000..d33a24dc
--- /dev/null
+++ b/helmfile/environments/test/sample.yaml.gotmpl
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0
+#
+# NOTE: Do not overwrite this file!
+# Place `.yaml.gotmpl` file(s) with your test environment specific settings into this folder.
+# As shown in the example you can even use templating.
+---
+sample:
+  withTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
+  withoutTemplating: "my_value"
+...
diff --git a/helmfile/environments/test/values.yaml.gotmpl.sample b/helmfile/environments/test/values.yaml.gotmpl.sample
deleted file mode 100644
index 0c4eb810..00000000
--- a/helmfile/environments/test/values.yaml.gotmpl.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
----
-sampleWithTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
-global:
-  imageRegistry: "your.private.oci-container-image-registry/with_optional_path"
-  helmRegistry: "your.private.oci-helm-chart-registry/with_optional_path"
-...