Skip to content

Skip creating core/jobservice secrets when using external secrets #2289

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

Open
eidmantas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Skip creating core/jobservice secrets when using external secrets #2289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,3 +604,39 @@ app: "{{ template "harbor.name" . }}"
{{- define "harbor.ingress.kubeVersion" -}}
{{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}}
{{- end -}}

{{/*
Determine if the core secret should be created.
Returns "true" if any data field would be populated, "false" if all fields use external secrets.
*/}}
{{- define "harbor.core.createSecret" -}}
{{- $needsSecretKey := not .Values.existingSecretSecretKey -}}
{{- $needsCoreSecret := not .Values.core.existingSecret -}}
{{- $needsTokenCert := not .Values.core.secretName -}}
{{- $needsAdminPassword := not .Values.existingSecretAdminPassword -}}
{{- $needsDbPassword := and (not .Values.database.external.existingSecret) (eq .Values.database.type "external") -}}
{{- $needsRegistryPassword := not .Values.registry.credentials.existingSecret -}}
{{- $needsCsrfKey := not .Values.core.existingXsrfSecret -}}
{{- $needsConfigOverwrite := .Values.core.configureUserSettings -}}
{{- $needsJaegerPassword := and .Values.trace.enabled (eq .Values.trace.provider "jaeger") -}}
{{- if or $needsSecretKey $needsCoreSecret $needsTokenCert $needsAdminPassword $needsDbPassword $needsRegistryPassword $needsCsrfKey $needsConfigOverwrite $needsJaegerPassword -}}
{{- printf "true" -}}
{{- else -}}
{{- printf "false" -}}
{{- end -}}
{{- end -}}

{{/*
Determine if the jobservice secret should be created.
Returns "true" if any data field would be populated, "false" if all fields use external secrets.
*/}}
{{- define "harbor.jobservice.createSecret" -}}
{{- $needsJobserviceSecret := not .Values.jobservice.existingSecret -}}
{{- $needsRegistryPassword := not .Values.registry.credentials.existingSecret -}}
{{- $needsJaegerPassword := and .Values.trace.enabled (eq .Values.trace.provider "jaeger") -}}
{{- if or $needsJobserviceSecret $needsRegistryPassword $needsJaegerPassword -}}
{{- printf "true" -}}
{{- else -}}
{{- printf "false" -}}
{{- end -}}
{{- end -}}
2 changes: 2 additions & 0 deletions templates/core/core-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if eq (include "harbor.core.createSecret" .) "true" }}
{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.core" .) }}
apiVersion: v1
kind: Secret
Expand Down Expand Up @@ -35,3 +36,4 @@ data:
CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }}
{{- end }}
{{- template "harbor.traceJaegerPassword" . }}
{{- end }}
2 changes: 2 additions & 0 deletions templates/jobservice/jobservice-secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if eq (include "harbor.jobservice.createSecret" .) "true" }}
{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.jobservice" .) }}
apiVersion: v1
kind: Secret
Expand All @@ -15,3 +16,4 @@ data:
REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }}
{{- end }}
{{- template "harbor.traceJaegerPassword" . }}
{{- end }}