Skip to content

Back Merge Master to Develop #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mguptahub merged 3 commits into from
Feb 18, 2025
Merged

Back Merge Master to Develop #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293c639
fix: silo hmac secret env
akshat5302 Feb 18, 2025
d7376ea
bumped chart version to `v1.1.5`
akshat5302 Feb 18, 2025
89f8edb
Merge pull request #77 from makeplane/fix-hmac-env
mguptahub Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/plane-enterprise/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
15 changes: 15 additions & 0 deletions charts/plane-enterprise/templates/config-secrets/silo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 5 additions & 0 deletions charts/plane-enterprise/templates/workloads/api.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ spec:
- secretRef:
name: {{ .Release.Name }}-doc-store-secrets
optional: false
{{- if .Values.services.silo.enabled }}
- secretRef:
name: {{ .Release.Name }}-silo-secrets
optional: false
{{- end }}
readinessProbe:
failureThreshold: 30
httpGet:
Expand Down
5 changes: 5 additions & 0 deletions charts/plane-enterprise/templates/workloads/beat-worker.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ spec:
- secretRef:
name: {{ .Release.Name }}-doc-store-secrets
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
Expand Down
5 changes: 5 additions & 0 deletions charts/plane-enterprise/templates/workloads/migrator.job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ spec:
- secretRef:
name: {{ .Release.Name }}-doc-store-secrets
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
Expand Down
3 changes: 3 additions & 0 deletions charts/plane-enterprise/templates/workloads/silo.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
Expand Down
5 changes: 5 additions & 0 deletions charts/plane-enterprise/templates/workloads/worker.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ spec:
- secretRef:
name: {{ .Release.Name }}-doc-store-secrets
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
Expand Down