Added helm charts for sp-next

zss1980 · zss1980 · commit dd71323a8fab · 2025-10-30T12:01:13.000-07:00
diff --git a/helm/applications/canfar-next/science-portal/.helmignore b/helm/applications/canfar-next/science-portal/.helmignore
@@ -1,23 +1,52 @@
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
+
+# Common VCS directories
 .git/
 .gitignore
 .bzr/
 .bzrignore
 .hg/
 .hgignore
 .svn/
+
 # Common backup files
 *.swp
 *.bak
 *.tmp
 *.orig
 *~
+
 # Various IDEs
 .project
 .idea/
 *.tmproj
 .vscode/
+*.code-workspace
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Helm-specific files
+.helmignore
+
+# Documentation
+README.md
+NOTES.md
+
+# CI/CD
+.github/
+.gitlab-ci.yml
+.travis.yml
+.circleci/
+
+# Development files
+values-dev.yaml
+values-local.yaml
+*.test.yaml
+
+# Temporary files
+tmp/
+temp/
diff --git a/helm/applications/canfar-next/science-portal/Chart.yaml b/helm/applications/canfar-next/science-portal/Chart.yaml
@@ -1,23 +1,13 @@
 apiVersion: v2
 name: science-portal
-description: Science Portal Helm Chart
-icon: https://www.canfar.net/css/images/logo.png
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+description: A Helm chart for Science Portal Next.js application
 type: application
-
-# Using 2.0.0 here to clearly indicate a major update from the previous 1.x.x versions.
-version: 2.0.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "2.0.0"
+version: 0.1.0
+appVersion: "0.1.0"
+keywords:
+  - nextjs
+  - science-portal
+  - web-application
+maintainers:
+  - name: Science Portal Team
+home: https://github.com/opencadc/science-portal
diff --git a/helm/applications/canfar-next/science-portal/templates/NOTES.txt b/helm/applications/canfar-next/science-portal/templates/NOTES.txt
diff --git a/helm/applications/canfar-next/science-portal/templates/_helpers.tpl b/helm/applications/canfar-next/science-portal/templates/_helpers.tpl
@@ -7,8 +7,6 @@ Expand the name of the chart.
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
 */}}
 {{- define "science-portal.fullname" -}}
 {{- if .Values.fullnameOverride }}
diff --git a/helm/applications/canfar-next/science-portal/templates/configmap.yaml b/helm/applications/canfar-next/science-portal/templates/configmap.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "science-portal.fullname" . }}
+  labels:
+    {{- include "science-portal.labels" . | nindent 4 }}
+data:
+  # This ConfigMap can be used for non-sensitive configuration
+  # For now, we're using environment variables directly in the deployment
+  # Add any configuration files or non-sensitive data here
diff --git a/helm/applications/canfar-next/science-portal/templates/deployment.yaml b/helm/applications/canfar-next/science-portal/templates/deployment.yaml
@@ -11,55 +11,85 @@ spec:
   selector:
     matchLabels:
       {{- include "science-portal.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "science-portal.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+      labels:
+        {{- include "science-portal.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "science-portal.serviceAccountName" . }}
-      {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
-          {{- with .Values.securityContext }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          {{- with .Values.livenessProbe }}
-          livenessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.readinessProbe }}
-          readinessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
+      - name: {{ .Chart.Name }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        ports:
+        - name: http
+          containerPort: {{ .Values.service.targetPort }}
+          protocol: TCP
+        livenessProbe:
+          {{- toYaml .Values.livenessProbe | nindent 12 }}
+        readinessProbe:
+          {{- toYaml .Values.readinessProbe | nindent 12 }}
+        resources:
+          {{- toYaml .Values.resources | nindent 12 }}
+        env:
+          {{- range .Values.env }}
+          - name: {{ .name }}
+            value: {{ .value | quote }}
           {{- end }}
+          # OIDC Configuration
+          - name: NEXT_OIDC_URI
+            value: {{ .Values.oidc.uri | quote }}
+          - name: NEXT_PUBLIC_OIDC_URI
+            value: {{ .Values.oidc.uri | quote }}
+          - name: NEXT_OIDC_CLIENT_ID
+            value: {{ .Values.oidc.clientId | quote }}
+          - name: NEXT_PUBLIC_OIDC_CLIENT_ID
+            value: {{ .Values.oidc.clientId | quote }}
+          - name: NEXT_OIDC_CALLBACK_URI
+            value: {{ .Values.oidc.callbackUri | quote }}
+          - name: NEXT_PUBLIC_OIDC_CALLBACK_URI
+            value: {{ .Values.oidc.callbackUri | quote }}
+          - name: NEXT_OIDC_REDIRECT_URI
+            value: {{ .Values.oidc.redirectUri | quote }}
+          - name: NEXT_PUBLIC_OIDC_REDIRECT_URI
+            value: {{ .Values.oidc.redirectUri | quote }}
+          - name: NEXT_OIDC_SCOPE
+            value: {{ .Values.oidc.scope | quote }}
+          - name: NEXT_PUBLIC_OIDC_SCOPE
+            value: {{ .Values.oidc.scope | quote }}
+          # Secrets from Kubernetes Secret
+          - name: AUTH_SECRET
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.secrets.existingSecret }}
+                key: {{ .Values.secrets.keys.authSecret }}
+          - name: NEXT_OIDC_CLIENT_SECRET
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.secrets.existingSecret }}
+                key: {{ .Values.secrets.keys.oidcClientSecret }}
+        {{- with .Values.volumeMounts }}
+        volumeMounts:
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
       {{- with .Values.volumes }}
       volumes:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/applications/canfar-next/science-portal/templates/httproute.yaml b/helm/applications/canfar-next/science-portal/templates/httproute.yaml
diff --git a/helm/applications/canfar-next/science-portal/templates/ingress.yaml b/helm/applications/canfar-next/science-portal/templates/ingress.yaml
@@ -10,8 +10,8 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- with .Values.ingress.className }}
-  ingressClassName: {{ . }}
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
@@ -30,9 +30,7 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- with .pathType }}
-            pathType: {{ . }}
-            {{- end }}
+            pathType: {{ .pathType }}
             backend:
               service:
                 name: {{ include "science-portal.fullname" $ }}
diff --git a/helm/applications/canfar-next/science-portal/templates/networkpolicy.yaml b/helm/applications/canfar-next/science-portal/templates/networkpolicy.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.networkPolicy.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "science-portal.fullname" . }}
+  labels:
+    {{- include "science-portal.labels" . | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include "science-portal.selectorLabels" . | nindent 6 }}
+  policyTypes:
+    {{- toYaml .Values.networkPolicy.policyTypes | nindent 4 }}
+  {{- with .Values.networkPolicy.ingress }}
+  ingress:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.networkPolicy.egress }}
+  egress:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/helm/applications/canfar-next/science-portal/templates/pdb.yaml b/helm/applications/canfar-next/science-portal/templates/pdb.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "science-portal.fullname" . }}
+  labels:
+    {{- include "science-portal.labels" . | nindent 4 }}
+spec:
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  selector:
+    matchLabels:
+      {{- include "science-portal.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/helm/applications/canfar-next/science-portal/templates/service.yaml b/helm/applications/canfar-next/science-portal/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "science-portal.fullname" . }}
   labels:
     {{- include "science-portal.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/helm/applications/canfar-next/science-portal/templates/serviceaccount.yaml b/helm/applications/canfar-next/science-portal/templates/serviceaccount.yaml
@@ -9,5 +9,4 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
 {{- end }}
diff --git a/helm/applications/canfar-next/science-portal/templates/tests/test-connection.yaml b/helm/applications/canfar-next/science-portal/templates/tests/test-connection.yaml
diff --git a/helm/applications/canfar-next/science-portal/values.yaml b/helm/applications/canfar-next/science-portal/values.yaml
