simplify secret keys

Author: nicktrn

hosting/k8s/helm/templates/secrets.yaml

@@ -7,12 +7,12 @@ metadata:
     {{- include "trigger-v4.labels" . | nindent 4 }}
 type: Opaque
 data:
-  session-secret: {{ .Values.secrets.sessionSecret | b64enc | quote }}
-  magic-link-secret: {{ .Values.secrets.magicLinkSecret | b64enc | quote }}
-  encryption-key: {{ .Values.secrets.encryptionKey | b64enc | quote }}
-  managed-worker-secret: {{ .Values.secrets.managedWorkerSecret | b64enc | quote }}
-  object-store-access-key-id: {{ .Values.secrets.objectStore.accessKeyId | b64enc | quote }}
-  object-store-secret-access-key: {{ .Values.secrets.objectStore.secretAccessKey | b64enc | quote }}
+  SESSION_SECRET: {{ .Values.secrets.sessionSecret | b64enc | quote }}
+  MAGIC_LINK_SECRET: {{ .Values.secrets.magicLinkSecret | b64enc | quote }}
+  ENCRYPTION_KEY: {{ .Values.secrets.encryptionKey | b64enc | quote }}
+  MANAGED_WORKER_SECRET: {{ .Values.secrets.managedWorkerSecret | b64enc | quote }}
+  OBJECT_STORE_ACCESS_KEY_ID: {{ .Values.secrets.objectStore.accessKeyId | b64enc | quote }}
+  OBJECT_STORE_SECRET_ACCESS_KEY: {{ .Values.secrets.objectStore.secretAccessKey | b64enc | quote }}
 {{- end }}
 ---
 {{- if and .Values.registry.enabled .Values.registry.auth.enabled }}

hosting/k8s/helm/templates/supervisor.yaml

@@ -123,7 +123,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: managed-worker-secret
+                  key: MANAGED_WORKER_SECRET
             {{- end }}
             # Worker instance configuration
             - name: TRIGGER_WORKER_INSTANCE_NAME

hosting/k8s/helm/templates/webapp.yaml

@@ -130,32 +130,32 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: session-secret
+                  key: SESSION_SECRET
             - name: MAGIC_LINK_SECRET
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: magic-link-secret
+                  key: MAGIC_LINK_SECRET
             - name: ENCRYPTION_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: encryption-key
+                  key: ENCRYPTION_KEY
             - name: MANAGED_WORKER_SECRET
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: managed-worker-secret
+                  key: MANAGED_WORKER_SECRET
             - name: OBJECT_STORE_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: object-store-access-key-id
+                  key: OBJECT_STORE_ACCESS_KEY_ID
             - name: OBJECT_STORE_SECRET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ include "trigger-v4.secretsName" . }}
-                  key: object-store-secret-access-key
+                  key: OBJECT_STORE_SECRET_ACCESS_KEY
             {{- end }}
             {{- if and .Values.webapp.internal .Values.webapp.internal.otel }}
             {{- if .Values.webapp.internal.otel.trace.exporterUrl }}

hosting/k8s/helm/values.yaml

@@ -157,12 +157,12 @@ secrets:
   # Name of existing secret to use instead of creating one
   # If empty, a secret will be created with the values below
   # The secret must contain the following keys:
-  #   - session-secret
-  #   - magic-link-secret
-  #   - encryption-key
-  #   - managed-worker-secret
-  #   - object-store-access-key-id
-  #   - object-store-secret-access-key
+  #   - SESSION_SECRET
+  #   - MAGIC_LINK_SECRET
+  #   - ENCRYPTION_KEY
+  #   - MANAGED_WORKER_SECRET
+  #   - OBJECT_STORE_ACCESS_KEY_ID
+  #   - OBJECT_STORE_SECRET_ACCESS_KEY
   existingSecret: ""
 
   # Session secret for user authentication (32 hex chars)