From c61fe1c59e7372ddef2816953e2ae1ddee1c889e Mon Sep 17 00:00:00 2001
From: Dev Jadeja <krushndevsinh@simformsolutions.com>
Date: Tue, 18 Mar 2025 17:23:01 +0530
Subject: [PATCH 1/3] [wip] feature: service with a static name across envs

---
 charts/py-app/templates/static-service.yaml | 18 ++++++++++++++++++
 charts/py-app/values.yaml                   |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 charts/py-app/templates/static-service.yaml

diff --git a/charts/py-app/templates/static-service.yaml b/charts/py-app/templates/static-service.yaml
new file mode 100644
index 0000000..b2c6155
--- /dev/null
+++ b/charts/py-app/templates/static-service.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.service.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.service.staticServiceName }}
+  labels:
+    {{- include "py-app.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.targetPort | default "static-service" }}
+      protocol: TCP
+      name: static-service
+  selector:
+    {{- include "py-app.selectorLabels" . | nindent 4 }}
+    deployment_type: web
+{{- end }}
diff --git a/charts/py-app/values.yaml b/charts/py-app/values.yaml
index 0e2db73..822c490 100644
--- a/charts/py-app/values.yaml
+++ b/charts/py-app/values.yaml
@@ -87,6 +87,7 @@ service:
   enabled: true
   type: ClusterIP
   port: 80
+  staticServiceName: ""
 
 ingress:
   enabled: false

From 10c3178d5461c5001c4cd581759b9030e52bd295 Mon Sep 17 00:00:00 2001
From: Dev Jadeja <krushndevsinh@simformsolutions.com>
Date: Tue, 18 Mar 2025 19:25:44 +0530
Subject: [PATCH 2/3] added default value used when staticServiceName is absent

---
 charts/py-app/templates/_helpers.tpl        | 7 +++++++
 charts/py-app/templates/static-service.yaml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/py-app/templates/_helpers.tpl b/charts/py-app/templates/_helpers.tpl
index 3857c41..34ee528 100644
--- a/charts/py-app/templates/_helpers.tpl
+++ b/charts/py-app/templates/_helpers.tpl
@@ -83,3 +83,10 @@ envFrom:
     {{- end }}
 {{- end }}
 {{ end -}}
+
+{{/*
+Create staticServiceName, same for all environments
+*/}}
+{{- define "py-app.staticServiceName" -}}
+{{- .Values.service.staticServiceName | default (printf "%s-%s" .Values.nameOverride "static-svc") }}
+{{- end }}
diff --git a/charts/py-app/templates/static-service.yaml b/charts/py-app/templates/static-service.yaml
index b2c6155..d3dddbd 100644
--- a/charts/py-app/templates/static-service.yaml
+++ b/charts/py-app/templates/static-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.staticServiceName }}
+  name: {{ include "py-app.staticServiceName" . }}
   labels:
     {{- include "py-app.labels" . | nindent 4 }}
 spec:

From 2e3a6197bbca914db1fbe84badc76d792838dbb0 Mon Sep 17 00:00:00 2001
From: Dev Jadeja <krushndevsinh@simformsolutions.com>
Date: Thu, 20 Mar 2025 11:30:27 +0530
Subject: [PATCH 3/3] fix: simplified conditional static service

---
 charts/py-app/templates/_helpers.tpl        | 7 -------
 charts/py-app/templates/static-service.yaml | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/charts/py-app/templates/_helpers.tpl b/charts/py-app/templates/_helpers.tpl
index 34ee528..3857c41 100644
--- a/charts/py-app/templates/_helpers.tpl
+++ b/charts/py-app/templates/_helpers.tpl
@@ -83,10 +83,3 @@ envFrom:
     {{- end }}
 {{- end }}
 {{ end -}}
-
-{{/*
-Create staticServiceName, same for all environments
-*/}}
-{{- define "py-app.staticServiceName" -}}
-{{- .Values.service.staticServiceName | default (printf "%s-%s" .Values.nameOverride "static-svc") }}
-{{- end }}
diff --git a/charts/py-app/templates/static-service.yaml b/charts/py-app/templates/static-service.yaml
index d3dddbd..84d4729 100644
--- a/charts/py-app/templates/static-service.yaml
+++ b/charts/py-app/templates/static-service.yaml
@@ -1,8 +1,8 @@
-{{- if .Values.service.enabled -}}
+{{- if and .Values.service.enabled .Values.service.staticServiceName -}}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "py-app.staticServiceName" . }}
+  name: {{ .Values.service.staticServiceName }}
   labels:
     {{- include "py-app.labels" . | nindent 4 }}
 spec: