Skip to content

Conditionally set backendImages credentials #1024

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
cypres wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Conditionally set backendImages credentials #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9d05ff
Conditionally set backendImages credentials
cypres May 16, 2026
4a05081
Revert configs.yaml strip — primary gate is _helpers.tpl
vvnpn-nv May 18, 2026
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
6 changes: 6 additions & 0 deletions deployments/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ limitations under the License.

SPDX-License-Identifier: Apache-2.0
"""

filegroup(
name = "values",
srcs = glob(["values/**"]),
visibility = ["//visibility:public"],
)
9 changes: 9 additions & 0 deletions deployments/charts/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,12 @@ filegroup(
srcs = glob(["quick-start/**"]),
visibility = ["//visibility:public"],
)

sh_test(
name = "service_public_registry_secret_render_test",
srcs = ["service/tests/public_registry_secret_render_test.sh"],
data = [
":service",
"//deployments:values",
],
)
23 changes: 22 additions & 1 deletion deployments/charts/service/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,36 @@ OSMO_CONFIGMAP_NAME deliberately references services.service.serviceName
{{- end }}
{{- end -}}

{{/*
The minimal deploy values keep nvcr-secret as the private-registry default for
existing deployments. Public installs can omit that Secret; in that case, do
not render references that make pods wait on or configs load a missing Secret.
*/}}
{{- define "osmo.config-secret-ref-enabled" -}}
{{- $secretName := .secretName | default "" -}}
{{- $root := .root -}}
{{- $imagePullSecret := $root.Values.global.imagePullSecret | default "" -}}
{{- if and (eq $secretName "nvcr-secret") (ne $imagePullSecret $secretName) (not (lookup "v1" "Secret" $root.Release.Namespace $secretName)) -}}
false
{{- else -}}
true
{{- end -}}
{{- end -}}

{{- define "osmo.configmap-volume-mounts" -}}
{{- if .Values.services.configs.enabled }}
- name: configs
mountPath: /etc/osmo/configs
readOnly: true
{{- range .Values.services.configs.secretRefs }}
{{- $secretName := .secretName | default "" }}
{{- if and $secretName (eq (include "osmo.config-secret-ref-enabled" (dict "root" $ "secretName" $secretName) | trim) "true") }}
- name: secret-{{ .secretName }}
mountPath: /etc/osmo/secrets/{{ .secretName }}
readOnly: true
{{- end }}
{{- end }}
{{- end }}
{{- end -}}

{{- define "osmo.configmap-volumes" -}}
Expand All @@ -197,10 +216,12 @@ OSMO_CONFIGMAP_NAME deliberately references services.service.serviceName
configMap:
name: {{ .Values.services.service.serviceName }}-configs
{{- range .Values.services.configs.secretRefs }}
{{- $secretName := .secretName | default "" }}
{{- if and $secretName (eq (include "osmo.config-secret-ref-enabled" (dict "root" $ "secretName" $secretName) | trim) "true") }}
- name: secret-{{ .secretName }}
secret:
secretName: {{ .secretName }}
{{- end }}
{{- end }}
{{- end }}
{{- end -}}

Loading