Initial attempt to restore templates and change only values-tacc-spherex

Author: phanigatech

applications/portal/Chart.yaml

@@ -3,9 +3,9 @@ name: portal
 version: 1.0.0
 description: Rubin Science Platform Portal Aspect
 sources:
+  - https://github.com/lsst/suit
   - https://github.com/Caltech-IPAC/firefly
-# -  Removed https://github.com/lsst/suit
-appVersion: "2025.5.4"
+appVersion: "portal-2025.5.2-b1"
 
 dependencies:
   - name: redis

applications/portal/templates/ingress-admin.yaml

@@ -20,10 +20,10 @@ template:
       nginx.ingress.kubernetes.io/proxy-body-size: "0m"
       nginx.ingress.kubernetes.io/proxy-buffer-size: "24k"
       nginx.ingress.kubernetes.io/client-header-buffer-size: "24k"
-      nginx.ingress.kubernetes.io/rewrite-target: "/firefly$1"
-      nginx.ingress.kubernetes.io/proxy-redirect-from: "/firefly/"
+      nginx.ingress.kubernetes.io/rewrite-target: "/suit$1"
+      nginx.ingress.kubernetes.io/proxy-redirect-from: "/suit/"
       nginx.ingress.kubernetes.io/proxy-redirect-to: "/portal/app/"
-      nginx.ingress.kubernetes.io/proxy-cookie-path: "/firefly /portal/app"
+      nginx.ingress.kubernetes.io/proxy-cookie-path: "/suit /portal/app"
       nginx.ingress.kubernetes.io/session-cookie-path: "/portal/app"
       nginx.ingress.kubernetes.io/configuration-snippet: |
         proxy_set_header X-Original-URI $request_uri;

applications/portal/templates/ingress.yaml

@@ -25,10 +25,10 @@ template:
       nginx.ingress.kubernetes.io/affinity: "cookie"
       nginx.ingress.kubernetes.io/client-header-buffer-size: "24k"
       nginx.ingress.kubernetes.io/proxy-body-size: "0m"
-      nginx.ingress.kubernetes.io/proxy-cookie-path: "/firefly /portal/app"
-      nginx.ingress.kubernetes.io/proxy-redirect-from: "/firefly/"
+      nginx.ingress.kubernetes.io/proxy-cookie-path: "/suit /portal/app"
+      nginx.ingress.kubernetes.io/proxy-redirect-from: "/suit/"
       nginx.ingress.kubernetes.io/proxy-redirect-to: "/portal/app/"
-      nginx.ingress.kubernetes.io/rewrite-target: "/firefly$1$2"
+      nginx.ingress.kubernetes.io/rewrite-target: "/suit$1$2"
       nginx.ingress.kubernetes.io/session-cookie-change-on-failure: "true"
       nginx.ingress.kubernetes.io/session-cookie-path: "/portal/app"
       nginx.ingress.kubernetes.io/configuration-snippet: |

applications/portal/values-tacc-spherex.yaml

@@ -1,3 +1,20 @@
 resources:
   limits:
     memory: "8Gi"
+
+image:
+  # -- Portal image to use
+  repository: "ipac/firefly"
+
+  # -- Pull policy for the Portal image
+  pullPolicy: "IfNotPresent"
+  # -- Tag of Portal image to use
+  # @default -- The appVersion of the chart
+  tag: "2025.5.4"
+
+ingress:
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/firefly$1$2"
+    nginx.ingress.kubernetes.io/proxy-redirect-from: "/firefly/"
+    nginx.ingress.kubernetes.io/proxy-redirect-to: "/portal/app/"
+    nginx.ingress.kubernetes.io/proxy-cookie-path: "/firefly /portal/app"

applications/portal/values.yaml

@@ -11,14 +11,14 @@ fullnameOverride: ""
 
 image:
   # -- Portal image to use
-  repository: "ipac/firefly"
+  repository: "ipac/suit"
 
   # -- Pull policy for the Portal image
   pullPolicy: "IfNotPresent"
 
   # -- Tag of Portal image to use
   # @default -- The appVersion of the chart
-  tag: "2025.5.4"
+  tag: ""
 
 ingress:
   # -- Additional annotations to add to the ingress