From fe1a432a35c3dce95565210f9a020e13468a3ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20J=C3=B6rg?= <moritz.jorg@oceanbox.io>
Date: Fri, 20 Jun 2025 10:31:52 +0200
Subject: [PATCH] fix(plume): Move ingress to staging

---
 charts/plume/templates/NOTES.txt              |  8 ++++----
 charts/plume/values.yaml                      | 20 +------------------
 values/plume/values/plume-staging.yaml.gotmpl | 19 ++++++++++++++++++
 3 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 values/plume/values/plume-staging.yaml.gotmpl

diff --git a/charts/plume/templates/NOTES.txt b/charts/plume/templates/NOTES.txt
index c8b089ca..80e43f5e 100644
--- a/charts/plume/templates/NOTES.txt
+++ b/charts/plume/templates/NOTES.txt
@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "Sorcerer.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "Plume.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "Sorcerer.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "Sorcerer.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "Plume.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "Plume.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "Sorcerer.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "Plume.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
diff --git a/charts/plume/values.yaml b/charts/plume/values.yaml
index 1fa05ca2..0e358cc2 100644
--- a/charts/plume/values.yaml
+++ b/charts/plume/values.yaml
@@ -46,25 +46,7 @@ service:
   type: ClusterIP
   port: 8085
 ingress:
-  enabled: true
-  className: "nginx"
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-staging
-    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-  hosts:
-    - host: plume.srv.oceanbox.io
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-      internal:
-        - path: /internal
-          pathType: ImplementationSpecific
-  tls:
-    - hosts:
-        - plume.srv.oceanbox.io
-      secretName: plume-tls
+  enabled: false
 persistence:
   enabled: false
   existingClaim: oceanbox-archives
diff --git a/values/plume/values/plume-staging.yaml.gotmpl b/values/plume/values/plume-staging.yaml.gotmpl
new file mode 100644
index 00000000..ae5734a9
--- /dev/null
+++ b/values/plume/values/plume-staging.yaml.gotmpl
@@ -0,0 +1,19 @@
+ingress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-staging
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  hosts:
+    - host: plume.ekman.oceanbox.io
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+      internal:
+        - path: /internal
+          pathType: ImplementationSpecific
+  tls:
+    - hosts:
+        - plume.ekman.oceanbox.io
+      secretName: plume-tls