fix: correct issue where skaffold setTemplateValues env vars were in …

…some cases empty

docs-v2/content/en/docs/pipeline-stages/deployers/helm.md

@@ -91,10 +91,10 @@ deploy:
     releases:
     - name: my-release
       setValueTemplates:
-        image.repository: "{{.myFirstImage.IMAGE_REPO}}"
-        image.tag: "{{.myFirstImage.IMAGE_TAG}}"
-        image2.repository: "{{.mySecondImage.IMAGE_REPO}}"
-        image2.tag: "{{.mySecondImage.IMAGE_TAG}}"
+        image.repository: "{{.IMAGE_REPO_myFirstImage}}"
+        image.tag: "{{.IMAGE_TAG_myFirstImage}}"
+        image2.repository: "{{.IMAGE_REPO_mySecondImage}}"
+        image2.tag: "{{.IMAGE_TAG_mySecondImage}}"
       setValues:
         image.pullPolicy: "IfNotPresent"
         image2.pullPolicy: "IfNotPresent"
@@ -112,12 +112,12 @@ The `setValues` configuration binds a Helm key to the specified value. The `setV
 | `{{.IMAGE_REPO_NO_DOMAIN_<artifact-name>}}` | `example-repo` |
 
 ### Sanitizing the artifact name from invalid go template characters
-The `<artifact-name>` (eg: `{{.IMAGE_FULLY_QUALIFIED_<artifact-name>}}`) when used with `setValueTemplates` cannot have `/` or `-` characters.  If you have an artifact name with these characters (eg: `localhost/nginx` or `gcr.io/foo-image/foo`), change them to use `_` in place of these characters in the `setValueTemplates` field
+The `<artifact-name>` (eg: `{{.IMAGE_FULLY_QUALIFIED_<artifact-name>}}`) when used with `setValueTemplates` cannot have `/`, `-`, or `.` characters.  If you have an artifact name with these characters (eg: `localhost/nginx` or `gcr.io/foo-image/foo`), change them to use `_` in place of these characters in the `setValueTemplates` field
 
 | Artifact name | Sanitized Name |
 | --------------- | --------------- |
 | `localhost/nginx` | `localhost_nginx`|
-| `gcr.io/example-repo/myImage` | `gcr.io_example_repo_myImage` |
+| `gcr.io/example-repo/myImage` | `gcr_io_example_repo_myImage` |
 
 Example
 ```yaml

docs-v2/content/en/docs/pipeline-stages/renderers/helm.md

@@ -112,12 +112,12 @@ The `setValues` configuration binds a Helm key to the specified value. The `setV
 | `{{.IMAGE_REPO_NO_DOMAIN_<artifact-name>}}` | `example-repo` |
 
 ### Sanitizing the artifact name from invalid go template characters
-The `<artifact-name>` (eg: `{{.IMAGE_FULLY_QUALIFIED_<artifact-name>}}`) when used with `setValueTemplates` cannot have `/` or `-` characters.  If you have an artifact name with these characters (eg: `localhost/nginx` or `gcr.io/foo-image/foo`), change them to use `_` in place of these characters in the `setValueTemplates` field
+The `<artifact-name>` (eg: `{{.IMAGE_FULLY_QUALIFIED_<artifact-name>}}`) when used with `setValueTemplates` cannot have `/`, `-`, or `.` characters.  If you have an artifact name with these characters (eg: `localhost/nginx` or `gcr.io/foo-image/foo`), change them to use `_` in place of these characters in the `setValueTemplates` field
 
 | Artifact name | Sanitized Name |
 | --------------- | --------------- |
 | `localhost/nginx` | `localhost_nginx`|
-| `gcr.io/example-repo/myImage` | `gcr.io_example_repo_myImage` |
+| `gcr.io/example-repo/myImage` | `gcr_io_example_repo_myImage` |
 
 Example
 ```yaml

examples/multi-config-microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v4beta1
+apiVersion: skaffold/v4beta2
 kind: Config
 requires:
 - path: ./leeroy-app

integration/helm_test.go

@@ -77,6 +77,8 @@ func TestDevHelmMultiConfig(t *testing.T) {
 
 			ns, _ := SetupNamespace(t)
 
+			skaffold.Run(test.args...).InDir(test.dir).InNs(ns.Name).WithEnv(test.env).RunOrFailOutput(t)
+
 			out := skaffold.Run(test.args...).InDir(test.dir).InNs(ns.Name).WithEnv(test.env).RunLive(t)
 			defer skaffold.Delete().InDir(test.dir).InNs(ns.Name).WithEnv(test.env).Run(t)
 

integration/testdata/helm-multi-config/skaffold/app1/skaffold.yml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3
+apiVersion: skaffold/v4beta2
 kind: Config
 build:
   artifacts:

integration/testdata/helm-multi-config/skaffold/app2/skaffold.yml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3
+apiVersion: skaffold/v4beta2
 kind: Config
 build:
   artifacts:

pkg/skaffold/util/util.go

@@ -317,6 +317,6 @@ func hasHiddenPrefix(s string) bool {
 }
 
 func SanitizeHelmTemplateValue(s string) string {
-	// replace commonly used image name chars that are illegal helm template chars "/" & "-" with "_"
-	return strings.ReplaceAll(strings.ReplaceAll(s, "-", "_"), "/", "_")
+	// replaces commonly used image name chars that are illegal go template chars -> replaces "/", "-" and "." with "_"
+	return strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(s, ".", "_"), "-", "_"), "/", "_")
 }