fix(helm): keep workflow pod templates unchanged

Author: ecolternv

deployments/charts/osmo/templates/configs.yaml

@@ -69,20 +69,8 @@ data:
       {{- toYaml $cfg.pools | nindent 6 }}
     {{- end }}
     {{- if $cfg.podTemplates }}
-    {{- $podTemplates := deepCopy $cfg.podTemplates }}
-    {{- if gt (len .Values.imagePullSecrets) 0 }}
-    {{- range $_, $podTemplate := $podTemplates }}
-    {{- if kindIs "map" $podTemplate }}
-    {{- $spec := index $podTemplate "spec" | default dict }}
-    {{- if and (kindIs "map" $spec) (not (hasKey $spec "imagePullSecrets")) }}
-    {{- $_ := set $spec "imagePullSecrets" $.Values.imagePullSecrets }}
-    {{- $_ := set $podTemplate "spec" $spec }}
-    {{- end }}
-    {{- end }}
-    {{- end }}
-    {{- end }}
     pod_templates:
-      {{- toYaml $podTemplates | nindent 6 }}
+      {{- toYaml $cfg.podTemplates | nindent 6 }}
     {{- end }}
     {{- if $cfg.resourceValidations }}
     resource_validations:

deployments/charts/osmo/tests/test_osmo_charts.sh

@@ -662,30 +662,19 @@ test_control_umbrella() {
         "init: nvcr.io/nvstaging/osmo/init-container:$quickstart_runtime_tag"
     require_contains "$TEST_DIRECTORY/quickstart-runtime-config.yaml" \
         "client: nvcr.io/nvstaging/osmo/client:$quickstart_runtime_tag"
-    require_contains "$TEST_DIRECTORY/quickstart-runtime-config.yaml" \
+    require_not_contains "$TEST_DIRECTORY/quickstart-runtime-config.yaml" \
         "imagePullSecrets:"
-    require_contains "$TEST_DIRECTORY/quickstart-runtime-config.yaml" \
-        "name: osmo-nvcr-pull"
     resource_document "$TEST_DIRECTORY/quickstart-runtime.yaml" Deployment \
         osmo-api >"$TEST_DIRECTORY/quickstart-runtime-api.yaml"
     require_contains "$TEST_DIRECTORY/quickstart-runtime-api.yaml" \
         "image: nvcr.io/nvstaging/osmo/service:$quickstart_runtime_tag"
+    require_contains "$TEST_DIRECTORY/quickstart-runtime-api.yaml" \
+        "imagePullSecrets:"
+    require_contains "$TEST_DIRECTORY/quickstart-runtime-api.yaml" \
+        "name: osmo-nvcr-pull"
     require_occurrences "$TEST_DIRECTORY/quickstart-runtime.yaml" \
         "image: nvcr.io/nvstaging/osmo/service:$quickstart_runtime_tag" 2
 
-    helm_template_with_backend quick-start-workflow-pull-secret "$charts_copy/osmo" \
-        --namespace osmo \
-        --api-versions postgresql.cnpg.io/v1 \
-        -f "$charts_copy/osmo/profiles/quickstart.yaml" \
-        --set-string 'imagePullSecrets[0].name=sentinel-pull-secret' \
-        >"$TEST_DIRECTORY/quickstart-workflow-pull-secret.yaml"
-    resource_document "$TEST_DIRECTORY/quickstart-workflow-pull-secret.yaml" ConfigMap \
-        osmo-api-config >"$TEST_DIRECTORY/quickstart-workflow-pull-secret-config.yaml"
-    require_contains "$TEST_DIRECTORY/quickstart-workflow-pull-secret-config.yaml" \
-        "name: sentinel-pull-secret"
-    require_not_contains "$TEST_DIRECTORY/quickstart-workflow-pull-secret-config.yaml" \
-        "name: osmo-nvcr-pull"
-
     helm_template_with_backend quick-start "$charts_copy/osmo" \
         --namespace osmo \
         --api-versions postgresql.cnpg.io/v1 \

deployments/charts/osmo/values.yaml

@@ -139,10 +139,8 @@ imageRepository: nvidia/osmo
 # service-specific image.tag or runtimeImage.tag takes precedence.
 imageTag: latest
 
-# Pull credential Secret references for OSMO-owned pods. They are also used as
-# defaults for workflow pod templates that do not define their own list.
-# Configure third-party dependency pull credentials in the dependency's native
-# values block.
+# Pull credential Secret references for OSMO-owned pods. Configure third-party
+# dependency pull credentials in the dependency's native values block.
 imagePullSecrets: []
 
 # Runtime image overrides for submitted workflows. Leave a field empty to