Merge pull request #13 from esgf2-us/update-v1.1.1

Update chart for metagrid v1.1.1
esgf2-us · Jul 8, 2024 · 6960553 · 6960553
2 parents 63169c6 + 196d323
commit 6960553
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 chart/charts
 **/.cr-release-packages/**
+temp/
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -176,7 +176,7 @@ Django CORS_ORIGIN_WHITELIST
 {{- with .affinity }}
 affinity:
 {{- toYaml . | nindent 2 }}
-{{- end }}
+{{- end -}}
 containers:
 - name: {{ .name }}
   {{- with .args }}

diff --git a/chart/templates/django/deployment.yaml b/chart/templates/django/deployment.yaml
@@ -5,6 +5,16 @@ metadata:
   labels:
     {{- include "metagrid.labels" . | nindent 4 }}
     app.kubernetes.io/component: django
+    {{- with .Values.django.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- $configmap := include (print $.Template.BasePath "/django/configmap.yaml") . }}
+    {{- $secret := include (print $.Template.BasePath "/django/secret.yaml") . }}
+    checksum/config: {{ print $configmap $secret | sha256sum }}
+    {{- with .Values.django.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   {{- if not .Values.django.autoscaling.enabled }}
   replicas: {{ .Values.django.replicaCount }}

diff --git a/chart/templates/django/secret.yaml b/chart/templates/django/secret.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: django
 data:
   {{- if eq .Values.authType "globus" }}
-  GLOBUS_CLIENT_SECRET: {{ .Values.globus.backend.clientSecret | b64enc }}
+  GLOBUS_CLIENT_SECRET: {{ default "" .Values.globus.backend.clientSecret | b64enc }}
   {{- end }}
   DJANGO_SECRET_KEY: {{ default (randBytes 50) .Values.django.secretKey | b64enc }}
   DATABASE_URL: {{ include "metagrid.pg_uri" . | b64enc }}

diff --git a/chart/templates/react/deployment.yaml b/chart/templates/react/deployment.yaml
@@ -5,6 +5,14 @@ metadata:
   labels:
     {{- include "metagrid.labels" . | nindent 4 }}
     app.kubernetes.io/component: react
+    {{- with .Values.react.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    checksum/config: {{ include (print $.Template.BasePath "/react/configmap.yaml") . | sha256sum }}
+    {{- with .Values.react.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   {{- if not .Values.react.autoscaling.enabled }}
   replicas: {{ .Values.react.replicaCount }}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -85,11 +85,17 @@ react:
     # -- Container pull policy
     pullPolicy: Always
     # -- Container tag
-    tag: latest
+    tag: v1.1.1-pre
 
   nameOverride: ""
   fullnameOverride: ""
 
+  # -- Extra labels
+  labels: {}
+
+  # -- Extra annotations
+  annotations: {}
+
   # -- Extra pod annotations
   podAnnotations: {}
 
@@ -186,11 +192,17 @@ django:
     # -- Image pull policy
     pullPolicy: Always
     # -- Container tag
-    tag: latest
+    tag: v1.1.1-pre
 
   nameOverride: ""
   fullnameOverride: ""
-
+
+  # -- Extra labels
+  labels: {}
+
+  # -- Extra annotations
+  annotations: {}
+
   # -- Extra pod annotations
   podAnnotations: {}