Merge pull request #353 from Flagsmith/fix/sse-secret

fix: Fix generating SSE secret

Author: rolodato

charts/flagsmith/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: flagsmith
 description: Flagsmith
 type: application
-version: 0.73.0
+version: 0.73.1
 appVersion: 2.170.0
 dependencies:
   - name: postgresql

charts/flagsmith/templates/django-secret-init/job.yaml

@@ -11,6 +11,7 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
+  ttlSecondsAfterFinished: 60
   template:
     metadata:
       name: {{ include "flagsmith.api.secretKeySecretName" . }}

charts/flagsmith/templates/sse-secret-init/job.yaml

@@ -11,6 +11,7 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
+  ttlSecondsAfterFinished: 60
   template:
     metadata:
       name: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
@@ -19,7 +20,7 @@ spec:
         app.kubernetes.io/component: sse-secret-init
     spec:
       restartPolicy: OnFailure
-      serviceAccountName: {{ include "flagsmith.fullname" . }}-sse-secret-init
+      serviceAccountName: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
       containers:
         - name: secret-creator
           image: bitnami/kubectl:latest

charts/flagsmith/templates/sse-secret-init/rbac.yaml

@@ -1,8 +1,8 @@
-{{- if and .Values.sse.enabled (not .Values.api.secretKeyFromExistingSecret.enabled) -}}
+{{- if and .Values.sse.enabled (not .Values.sse.authenticationTokenFromExistingSecret.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "flagsmith.fullname" . }}-sse-secret-init
+  name: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "flagsmith.labels" . | nindent 4 }}
@@ -17,7 +17,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "flagsmith.fullname" . }}-sse-secret-init
+  name: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "flagsmith.labels" . | nindent 4 }}
@@ -27,9 +27,9 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ include "flagsmith.fullname" . }}-sse-secret-init
+  name: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "flagsmith.fullname" . }}-sse-secret-init
+  name: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
   namespace: {{ .Release.Namespace | quote }}
 {{- end }}

charts/flagsmith/templates/sse-secret-init/serviceaccount.yaml

@@ -1,8 +1,8 @@
-{{- if and .Values.sse.enabled (not .Values.api.secretKeyFromExistingSecret.enabled) -}}
+{{- if and .Values.sse.enabled (not .Values.sse.authenticationTokenFromExistingSecret.enabled) -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "flagsmith.fullname" . }}-django-secret-init
+  name: {{ include "flagsmith.sse.authenticationTokenSecretName" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "flagsmith.labels" . | nindent 4 }}