diff --git a/charts/pterodactyl-panel/Chart.yaml b/charts/pterodactyl-panel/Chart.yaml index 90eba8f..afc132a 100644 --- a/charts/pterodactyl-panel/Chart.yaml +++ b/charts/pterodactyl-panel/Chart.yaml @@ -3,7 +3,7 @@ name: pterodactyl-panel description: A Helm chart for pterodactyl.io type: application icon: "https://cdn.pterodactyl.io/logos/new/pterodactyl_logo_transparent.png" -version: 0.4.13 +version: 0.4.14 dependencies: - name: mariadb version: "20.2.1" diff --git a/charts/pterodactyl-panel/templates/app-key-secrets.yaml b/charts/pterodactyl-panel/templates/app-key-secrets.yaml index 6067783..895ffa6 100644 --- a/charts/pterodactyl-panel/templates/app-key-secrets.yaml +++ b/charts/pterodactyl-panel/templates/app-key-secrets.yaml @@ -1,7 +1,9 @@ +{{- if not .Values.appConfig.secretName -}} apiVersion: v1 kind: Secret metadata: name: {{ include "pterodactyl-panel.fullname" . }}-{{ .Values.appConfig.appKey.secretName }} type: Opaque stringData: - APP_KEY: {{ include "pterodactyl-panel.appKey" . }} \ No newline at end of file + APP_KEY: {{ include "pterodactyl-panel.appKey" . }} +{{- end }} \ No newline at end of file diff --git a/charts/pterodactyl-panel/templates/configmap.yaml b/charts/pterodactyl-panel/templates/configmap.yaml index 02d2db8..1f3333c 100644 --- a/charts/pterodactyl-panel/templates/configmap.yaml +++ b/charts/pterodactyl-panel/templates/configmap.yaml @@ -21,7 +21,7 @@ data: DB_DATABASE: {{ .Values.mariadb.auth.database }} DB_USERNAME: {{ .Values.mariadb.auth.username }} DB_PASSWORD: {{ .Values.mariadb.auth.password }} - {{- if .Values.appConfig.mailSecretRef }} + {{- if not .Values.appConfig.mailSecretRef }} MAIL_DRIVER: {{ .Values.appConfig.mail.driver }} MAIL_HOST: {{ .Values.appConfig.mail.host }} MAIL_PORT: {{ .Values.appConfig.mail.port | quote }} diff --git a/charts/pterodactyl-panel/templates/deployment.yaml b/charts/pterodactyl-panel/templates/deployment.yaml index 4ba13f4..38cb1c6 100644 --- a/charts/pterodactyl-panel/templates/deployment.yaml +++ b/charts/pterodactyl-panel/templates/deployment.yaml @@ -52,6 +52,10 @@ spec: - secretRef: name: {{ .Values.appConfig.mailSecretRef }} {{- end }} + {{- if .Values.appConfig.secretName }} + - secretRef: + name: {{ .Values.appConfig.secretName }} + {{- end }} volumeMounts: - mountPath: /app/var/ name: pterodactyl-panel-storage diff --git a/charts/pterodactyl-panel/templates/hashid-secrets.yaml b/charts/pterodactyl-panel/templates/hashid-secrets.yaml index 0c9ff2f..da63660 100644 --- a/charts/pterodactyl-panel/templates/hashid-secrets.yaml +++ b/charts/pterodactyl-panel/templates/hashid-secrets.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.appConfig.secretName -}} apiVersion: v1 kind: Secret metadata: @@ -5,4 +6,5 @@ metadata: type: Opaque stringData: HASHIDS_SALT: {{ include "pterodactyl-panel.appHashSalt" . }} - HASHIDS_LENGTH: {{ .Values.appConfig.hashLength | quote }} \ No newline at end of file + HASHIDS_LENGTH: {{ .Values.appConfig.hashLength | quote }} +{{- end }} \ No newline at end of file diff --git a/charts/pterodactyl-panel/values.yaml b/charts/pterodactyl-panel/values.yaml index 4719955..cfbd8f6 100644 --- a/charts/pterodactyl-panel/values.yaml +++ b/charts/pterodactyl-panel/values.yaml @@ -1,5 +1,6 @@ appConfig: url: "http://pterodactyl.local" + secretName: key: hashSalt: hashLength: 8