Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions charts/openproject/templates/cron-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ include "common.names.fullname" . }}-cron
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
openproject/process: cron
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
kind: Ingress
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/persistentvolumeclaim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apiVersion: "v1"
kind: "PersistentVolumeClaim"
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
{{- with .Values.persistence.annotations }}
Expand Down
3 changes: 2 additions & 1 deletion charts/openproject/templates/secret_core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: "v1"
kind: "Secret"
metadata:
name: "{{ include "common.names.fullname" . }}-core"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
data: # reset data to make sure only keys defined below remain
Expand Down Expand Up @@ -73,7 +74,7 @@ stringData:
{{- if .Values.postgresql.options.sslMinProtocolVersion }}
OPENPROJECT_DB_SSL_MIN_PROTOCOL_VERSION: {{ .Values.postgresql.options.sslMinProtocolVersion | toString }}
{{- end }}
{{ $secret := (lookup "v1" "Secret" .Release.Namespace (default "_" .Values.openproject.admin_user.secret)) | default (dict "data" dict) -}}
{{ $secret := (lookup "v1" "Secret" (include "common.names.namespace" .) (default "_" .Values.openproject.admin_user.secret)) | default (dict "data" dict) -}}
OPENPROJECT_SEED_ADMIN_USER_PASSWORD: {{ default .Values.openproject.admin_user.password (get $secret.data .Values.openproject.admin_user.secretKeys.password | b64dec) | quote }}
OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET: {{ .Values.openproject.admin_user.password_reset | quote }}
OPENPROJECT_SEED_ADMIN_USER_NAME: {{ .Values.openproject.admin_user.name | quote }}
Expand Down
3 changes: 2 additions & 1 deletion charts/openproject/templates/secret_cron_environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: "v1"
kind: "Secret"
metadata:
name: "{{ include "common.names.fullname" . }}-cron-environment"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
data: # reset data to make sure only keys defined below remain
Expand All @@ -12,7 +13,7 @@ stringData:
{{- range $key, $value := omit .Values.cron.environment "IMAP_USERNAME" "IMAP_PASSWORD" }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{ $secret := (lookup "v1" "Secret" .Release.Namespace (default "_" .Values.cron.existingSecret)) | default (dict "data" dict) -}}
{{ $secret := (lookup "v1" "Secret" (include "common.names.namespace" .) (default "_" .Values.cron.existingSecret)) | default (dict "data" dict) -}}
IMAP_USERNAME: {{
default .Values.cron.environment.IMAP_USERNAME (get $secret.data .Values.cron.secretKeys.imapUsername | b64dec) | quote
}}
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/secret_environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: "v1"
kind: "Secret"
metadata:
name: "{{ include "common.names.fullname" . }}-environment"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
data: # reset data to make sure only keys defined below remain
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/secret_memcached.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: "v1"
kind: "Secret"
metadata:
name: "{{ include "common.names.fullname" . }}-memcached"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
data: # reset data to make sure only keys defined below remain
Expand Down
3 changes: 2 additions & 1 deletion charts/openproject/templates/secret_oidc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: "v1"
kind: "Secret"
metadata:
name: "{{ include "common.names.fullname" . }}-oidc"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
data: # reset data to make sure only keys defined below remain
Expand All @@ -13,7 +14,7 @@ stringData:
{{ $oidc_prefix }}_DISPLAY__NAME: {{ .Values.openproject.oidc.displayName | quote }}
{{ $oidc_prefix }}_HOST: {{ .Values.openproject.oidc.host | quote }}
{{/* Fall back to '_' as secret name if the name is not given. This way `lookup` will return null (since secrets with this name will and cannot exist) which it doesn't with an empty string. */}}
{{ $secret := (lookup "v1" "Secret" .Release.Namespace (default "_" .Values.openproject.oidc.existingSecret)) | default (dict "data" dict) -}}
{{ $secret := (lookup "v1" "Secret" (include "common.names.namespace" .) (default "_" .Values.openproject.oidc.existingSecret)) | default (dict "data" dict) -}}
{{ $oidc_prefix }}_IDENTIFIER: {{
default .Values.openproject.oidc.identifier (get $secret.data .Values.openproject.oidc.secretKeys.identifier | b64dec) | quote
}}
Expand Down
3 changes: 2 additions & 1 deletion charts/openproject/templates/secret_s3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ apiVersion: "v1"
kind: "Secret"
metadata:
name: "{{ include "common.names.fullname" . }}-s3"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
data: # reset data to make sure only keys defined below remain
stringData:
OPENPROJECT_ATTACHMENTS__STORAGE: fog
OPENPROJECT_FOG_CREDENTIALS_PROVIDER: AWS
{{/* Fall back to '_' as secret name if the name is not given. This way `lookup` will return null (since secrets with this name will and cannot exist) which it doesn't with an empty string. */}}
{{ $secret := (lookup "v1" "Secret" .Release.Namespace (default "_" .Values.s3.auth.existingSecret)) | default (dict "data" dict) -}}
{{ $secret := (lookup "v1" "Secret" (include "common.names.namespace" .) (default "_" .Values.s3.auth.existingSecret)) | default (dict "data" dict) -}}
OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID: {{
default .Values.s3.auth.accessKeyId (get $secret.data .Values.s3.auth.secretKeys.accessKeyId | b64dec) | quote
}}
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/seeder-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ include "common.names.fullname" . }}-seeder-{{ .Release.Revision }}
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
{{- with .Values.seederJob.annotations }}
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: "v1"
kind: "Service"
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
spec:
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: "v1"
kind: "ServiceAccount"
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/tests/test-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: "v1"
kind: "Pod"
metadata:
name: "{{ include "common.names.fullname" . }}-test-connection"
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
annotations:
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/web-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ include "common.names.fullname" . }}-web
namespace: {{ include "common.names.namespace" . }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
openproject/process: web
Expand Down
1 change: 1 addition & 0 deletions charts/openproject/templates/worker-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ include "common.names.fullname" . }}-worker-{{ $workerName }}
namespace: {{ include "common.names.namespace" $ }}
labels:
{{- include "common.labels.standard" . | nindent 4 }}
openproject/process: worker-{{ $workerName }}
Expand Down