Merge pull request #78 from makeplane/master

Back Merge Master to Develop

Author: mguptahub

charts/plane-enterprise/Chart.yaml

@@ -5,7 +5,7 @@ description: Meet Plane. An Enterprise software development tool to manage issue
 
 type: application
 
-version: 1.1.4
+version: 1.1.5
 appVersion: "1.8.0"
 
 home: https://plane.so/

charts/plane-enterprise/templates/config-secrets/silo.yaml

@@ -1,5 +1,20 @@
 {{- if .Values.services.silo.enabled }}
 
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ .Release.Name }}-silo-secrets
+stringData:
+  {{- if .Values.env.silo_envs.hmac_secret_key }}
+  SILO_HMAC_SECRET_KEY: {{ .Values.env.silo_envs.hmac_secret_key | quote }}
+  {{- else if (lookup "v1" "Secret" .Release.Namespace (printf "%s-silo-secrets" .Release.Name)) }}
+  SILO_HMAC_SECRET_KEY: {{ (lookup "v1" "Secret" .Release.Namespace (printf "%s-silo-secrets" .Release.Name)).data.SILO_HMAC_SECRET_KEY | default (randAlphaNum 32) | quote }}
+  {{- else }}
+  SILO_HMAC_SECRET_KEY: {{ randAlphaNum 32 | quote }}
+  {{- end }}
+---
+
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/plane-enterprise/templates/workloads/api.deployment.yaml

@@ -63,6 +63,11 @@ spec:
           - secretRef:
               name: {{ if not (empty .Values.external_secrets.doc_store_existingSecret) }}{{ .Values.external_secrets.doc_store_existingSecret }}{{ else }}{{ .Release.Name }}-doc-store-secrets{{ end }}
               optional: false
+          {{- if .Values.services.silo.enabled }}
+          - secretRef:
+              name: {{ .Release.Name }}-silo-secrets
+              optional: false
+          {{- end }}
         readinessProbe:
           failureThreshold: 30
           httpGet:

charts/plane-enterprise/templates/workloads/beat-worker.deployment.yaml

@@ -41,6 +41,11 @@ spec:
           - secretRef:
               name: {{ if not (empty .Values.external_secrets.doc_store_existingSecret) }}{{ .Values.external_secrets.doc_store_existingSecret }}{{ else }}{{ .Release.Name }}-doc-store-secrets{{ end }}
               optional: false
+          {{- if .Values.services.silo.enabled }}
+          - secretRef:
+              name: {{ .Release.Name }}-silo-secrets
+              optional: false
+          {{- end }}
 
       serviceAccount: {{ .Release.Name }}-srv-account
       serviceAccountName: {{ .Release.Name }}-srv-account

charts/plane-enterprise/templates/workloads/migrator.job.yaml

@@ -29,6 +29,11 @@ spec:
           - secretRef:
               name: {{ if not (empty .Values.external_secrets.doc_store_existingSecret) }}{{ .Values.external_secrets.doc_store_existingSecret }}{{ else }}{{ .Release.Name }}-doc-store-secrets{{ end }}
               optional: false
+          {{- if .Values.services.silo.enabled }}
+          - secretRef:
+              name: {{ .Release.Name }}-silo-secrets
+              optional: false
+          {{- end }}
       restartPolicy: OnFailure
       serviceAccount: {{ .Release.Name }}-srv-account
       serviceAccountName: {{ .Release.Name }}-srv-account

charts/plane-enterprise/templates/workloads/silo.deployment.yaml

@@ -80,6 +80,9 @@ spec:
           - configMapRef:
               name: {{ .Release.Name }}-silo-vars
               optional: false
+          - secretRef:
+              name: {{ .Release.Name }}-silo-secrets
+              optional: false
       serviceAccount: {{ .Release.Name }}-srv-account
       serviceAccountName: {{ .Release.Name }}-srv-account
 ---

charts/plane-enterprise/templates/workloads/worker.deployment.yaml

@@ -41,6 +41,11 @@ spec:
           - secretRef:
               name: {{ if not (empty .Values.external_secrets.doc_store_existingSecret) }}{{ .Values.external_secrets.doc_store_existingSecret }}{{ else }}{{ .Release.Name }}-doc-store-secrets{{ end }}
               optional: false
+          {{- if .Values.services.silo.enabled }}
+          - secretRef:
+              name: {{ .Release.Name }}-silo-secrets
+              optional: false
+          {{- end }}
 
       serviceAccount: {{ .Release.Name }}-srv-account
       serviceAccountName: {{ .Release.Name }}-srv-account