Commit 83868f0d authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '57-existing-secrets' into 'develop' 

Allow specifying existing secrets in helm chart

See merge request !64
parents b27b0130 31fa266c

kubernetes/helm/openslice/templates/_helpers.tpl

+51 −0
Original line number Diff line number Diff line
@@ -60,3 +60,54 @@ Create the name of the service account to use 
{{- default "default" .Values.serviceAccount.name }}

{{- end }}

{{- end }}



{{/*

Secrets

*/}}

{{- define "openslice.secrets.activemq" -}}

{{- if .Values.oscreds.activemq.existingSecret }}

{{- .Values.oscreds.activemq.existingSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-artemis-secret

{{- end }}

{{- end }}



{{- define "openslice.secrets.mysql" -}}

{{- if .Values.oscreds.mysql.existingSecret }}

{{- .Values.oscreds.mysql.existingSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-mysql-secrets

{{- end }}

{{- end }}



{{- define "openslice.secrets.keycloak.mysql" -}}

{{- if .Values.oscreds.mysql.keycloak.existingMySQLSecret }}

{{- .Values.oscreds.mysql.keycloak.existingMySQLSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-mysql-keycloak-secrets

{{- end }}

{{- end }}



{{- define "openslice.secrets.keycloak.admin" -}}

{{- if .Values.oscreds.mysql.keycloak.existingSecret }}

{{- .Values.oscreds.mysql.keycloak.existingSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-keycloak-secret

{{- end }}

{{- end }}



{{- define "openslice.secrets.portal.mysql" -}}

{{- if .Values.oscreds.mysql.portal.existingSecret }}

{{- .Values.oscreds.mysql.portal.existingSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-mysql-portal-secrets

{{- end }}

{{- end }}



{{- define "openslice.secrets.metrico.mysql" -}}

{{- if .Values.oscreds.mysql.metrico.existingSecret }}

{{- .Values.oscreds.mysql.metrico.existingSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-mysql-metrico-secrets

{{- end }}

{{- end }}

kubernetes/helm/openslice/templates/artemis-secret.yaml

+2 −0
Original line number Diff line number Diff line 
{{- if not .Values.oscreds.activemq.existingSecret -}}

apiVersion: v1

kind: Secret

metadata:
@@ -11,3 +12,4 @@ metadata: 
data:

  username: {{ .Values.oscreds.activemq.user | b64enc }}

  password: {{ .Values.oscreds.activemq.password | b64enc }}

{{- end -}}

kubernetes/helm/openslice/templates/artemis.yaml

+2 −2
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ spec: 
            - name: ARTEMIS_USER

              valueFrom:

                secretKeyRef:

                  name: {{ include "openslice.fullname" . }}-artemis-secret

                  name: {{ include "openslice.secrets.activemq" . }}

                  key: username

            - name: ARTEMIS_PASSWORD

              valueFrom:

                secretKeyRef:

                  name: {{ include "openslice.fullname" . }}-artemis-secret

                  name: {{ include "openslice.secrets.activemq" . }}

                  key: password

          resources:

            {{- toYaml .Values.resources | nindent 12 }}

kubernetes/helm/openslice/templates/bugzilla.yaml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ spec: 
      volumes:

        - name: artemis-secrets

          secret:

            secretName: {{ include "openslice.fullname" . }}-artemis-secret

            secretName: {{ include "openslice.secrets.activemq" . }}

---

apiVersion: v1

kind: Service

kubernetes/helm/openslice/templates/centrallog.yaml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ spec: 
      volumes:

        - name: artemis-secrets

          secret:

            secretName: {{ include "openslice.fullname" . }}-artemis-secret

            secretName: {{ include "openslice.secrets.activemq" . }}

---

apiVersion: v1

kind: Service