diff --git a/utils/helm/speckle-server/templates/objects/deployment.yml b/utils/helm/speckle-server/templates/objects/deployment.yml index d19fa5f93..42462820f 100644 --- a/utils/helm/speckle-server/templates/objects/deployment.yml +++ b/utils/helm/speckle-server/templates/objects/deployment.yml @@ -60,7 +60,7 @@ spec: - name: postgres-certificate mountPath: /postgres-certificate {{- end }} - {{- if .Values.featureFlags.automateModuleEnabled }} + {{- if (or .Values.featureFlags.automateModuleEnabled .Values.featureFlags.workspacesSSOEnabled) }} - name: encryption-keys readOnly: true mountPath: /encryption-keys @@ -151,7 +151,7 @@ spec: configMap: name: postgres-certificate {{- end }} - {{- if .Values.featureFlags.automateModuleEnabled }} + {{- if (or .Values.featureFlags.automateModuleEnabled .Values.featureFlags.workspacesSSOEnabled) }} - name: encryption-keys secret: secretName: encryption-keys diff --git a/utils/helm/speckle-server/templates/objects/serviceaccount.yml b/utils/helm/speckle-server/templates/objects/serviceaccount.yml index 824898744..1aa92e63f 100644 --- a/utils/helm/speckle-server/templates/objects/serviceaccount.yml +++ b/utils/helm/speckle-server/templates/objects/serviceaccount.yml @@ -37,7 +37,7 @@ secrets: {{- if .Values.server.monitoring.apollo.enabled }} - name: {{ default .Values.secretName .Values.server.monitoring.apollo.key.secretName }} {{- end }} -{{- if .Values.featureFlags.automateModuleEnabled }} +{{- if (or .Values.featureFlags.automateModuleEnabled .Values.featureFlags.workspacesSSOEnabled) }} - name: encryption-keys {{- end }} {{- if .Values.featureFlags.workspacesModuleEnabled }} diff --git a/utils/helm/speckle-server/templates/server/deployment.yml b/utils/helm/speckle-server/templates/server/deployment.yml index ea318c33c..95deb9219 100644 --- a/utils/helm/speckle-server/templates/server/deployment.yml +++ b/utils/helm/speckle-server/templates/server/deployment.yml @@ -60,7 +60,7 @@ spec: - name: postgres-certificate mountPath: /postgres-certificate {{- end }} - {{- if .Values.featureFlags.automateModuleEnabled }} + {{- if (or .Values.featureFlags.automateModuleEnabled .Values.featureFlags.workspacesSSOEnabled) }} - name: encryption-keys readOnly: true mountPath: /encryption-keys @@ -151,7 +151,7 @@ spec: configMap: name: postgres-certificate {{- end }} - {{- if .Values.featureFlags.automateModuleEnabled }} + {{- if (or .Values.featureFlags.automateModuleEnabled .Values.featureFlags.workspacesSSOEnabled) }} - name: encryption-keys secret: secretName: encryption-keys diff --git a/utils/helm/speckle-server/templates/server/serviceaccount.yml b/utils/helm/speckle-server/templates/server/serviceaccount.yml index 50d50962e..25f620625 100644 --- a/utils/helm/speckle-server/templates/server/serviceaccount.yml +++ b/utils/helm/speckle-server/templates/server/serviceaccount.yml @@ -37,7 +37,7 @@ secrets: {{- if .Values.server.monitoring.apollo.enabled }} - name: {{ default .Values.secretName .Values.server.monitoring.apollo.key.secretName }} {{- end }} -{{- if .Values.featureFlags.automateModuleEnabled }} +{{- if (or .Values.featureFlags.automateModuleEnabled .Values.featureFlags.workspacesSSOEnabled) }} - name: encryption-keys {{- end }} {{- if .Values.featureFlags.workspacesModuleEnabled }}