Merge pull request validatedpatterns#237 from mhjacks/main

Ensure built_tags is handled as an array with blank values file
claudiol · Nov 17, 2023 · 448ef3d · 448ef3d
2 parents 86c7eb2 + be21e0c
commit 448ef3d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml b/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml
@@ -11,7 +11,7 @@ spec:
     importPolicy: {}
     referencePolicy:
       type: Local
-{{- if .Values.iot_consumer.built_tags }}
+{{- range .Values.iot_consumer.built_tags }}
   - name: {{ . | quote }}
     from:
       kind: DockerImage

diff --git a/charts/datacenter/pipelines/templates/tasks/gitops-imagetag.yaml b/charts/datacenter/pipelines/templates/tasks/gitops-imagetag.yaml
@@ -47,7 +47,7 @@ spec:
       ls -al $VALUES_PATH
       BUILT_TAGS_PATH="$(cat $(workspaces.config.path)/$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH)"
       echo "$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH) : $BUILT_TAGS_PATH"
-      yq "$BUILT_TAGS_PATH += \"$TAG_VALUE\"" $VALUES_PATH > $VALUES_PATH.tmp
+      yq "$BUILT_TAGS_PATH += [ \"$TAG_VALUE\" ]" $VALUES_PATH > $VALUES_PATH.tmp
       mv $VALUES_PATH.tmp $VALUES_PATH
     workingDir: $(workspaces.gitrepos.path)/$(params.subdirectory)
   - name: prune-built-tags

diff --git a/charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml b/charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml
@@ -14,7 +14,7 @@ spec:
     importPolicy: {}
     referencePolicy:
       type: Local
-{{- if .Values.iot_consumer.built_tags }}
+{{- range .Values.iot_consumer.built_tags }}
   - name: {{ $.Values.iot_consumer.tag | quote }}
     from:
       kind: DockerImage

diff --git a/tests/datacenter-pipelines-industrial-edge-factory.expected.yaml b/tests/datacenter-pipelines-industrial-edge-factory.expected.yaml
@@ -3539,7 +3539,7 @@ spec:
       ls -al $VALUES_PATH
       BUILT_TAGS_PATH="$(cat $(workspaces.config.path)/$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH)"
       echo "$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH) : $BUILT_TAGS_PATH"
-      yq "$BUILT_TAGS_PATH += \"$TAG_VALUE\"" $VALUES_PATH > $VALUES_PATH.tmp
+      yq "$BUILT_TAGS_PATH += [ \"$TAG_VALUE\" ]" $VALUES_PATH > $VALUES_PATH.tmp
       mv $VALUES_PATH.tmp $VALUES_PATH
     workingDir: $(workspaces.gitrepos.path)/$(params.subdirectory)
   - name: prune-built-tags

diff --git a/tests/datacenter-pipelines-industrial-edge-hub.expected.yaml b/tests/datacenter-pipelines-industrial-edge-hub.expected.yaml
@@ -3539,7 +3539,7 @@ spec:
       ls -al $VALUES_PATH
       BUILT_TAGS_PATH="$(cat $(workspaces.config.path)/$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH)"
       echo "$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH) : $BUILT_TAGS_PATH"
-      yq "$BUILT_TAGS_PATH += \"$TAG_VALUE\"" $VALUES_PATH > $VALUES_PATH.tmp
+      yq "$BUILT_TAGS_PATH += [ \"$TAG_VALUE\" ]" $VALUES_PATH > $VALUES_PATH.tmp
       mv $VALUES_PATH.tmp $VALUES_PATH
     workingDir: $(workspaces.gitrepos.path)/$(params.subdirectory)
   - name: prune-built-tags

diff --git a/tests/datacenter-pipelines-medical-diagnosis-hub.expected.yaml b/tests/datacenter-pipelines-medical-diagnosis-hub.expected.yaml
@@ -3539,7 +3539,7 @@ spec:
       ls -al $VALUES_PATH
       BUILT_TAGS_PATH="$(cat $(workspaces.config.path)/$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH)"
       echo "$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH) : $BUILT_TAGS_PATH"
-      yq "$BUILT_TAGS_PATH += \"$TAG_VALUE\"" $VALUES_PATH > $VALUES_PATH.tmp
+      yq "$BUILT_TAGS_PATH += [ \"$TAG_VALUE\" ]" $VALUES_PATH > $VALUES_PATH.tmp
       mv $VALUES_PATH.tmp $VALUES_PATH
     workingDir: $(workspaces.gitrepos.path)/$(params.subdirectory)
   - name: prune-built-tags

diff --git a/tests/datacenter-pipelines-naked.expected.yaml b/tests/datacenter-pipelines-naked.expected.yaml
@@ -3539,7 +3539,7 @@ spec:
       ls -al $VALUES_PATH
       BUILT_TAGS_PATH="$(cat $(workspaces.config.path)/$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH)"
       echo "$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH) : $BUILT_TAGS_PATH"
-      yq "$BUILT_TAGS_PATH += \"$TAG_VALUE\"" $VALUES_PATH > $VALUES_PATH.tmp
+      yq "$BUILT_TAGS_PATH += [ \"$TAG_VALUE\" ]" $VALUES_PATH > $VALUES_PATH.tmp
       mv $VALUES_PATH.tmp $VALUES_PATH
     workingDir: $(workspaces.gitrepos.path)/$(params.subdirectory)
   - name: prune-built-tags

diff --git a/tests/datacenter-pipelines-normal.expected.yaml b/tests/datacenter-pipelines-normal.expected.yaml
@@ -3539,7 +3539,7 @@ spec:
       ls -al $VALUES_PATH
       BUILT_TAGS_PATH="$(cat $(workspaces.config.path)/$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH)"
       echo "$(params.CONFIGMAP_PREFIX)_BUILT_TAGS_PATH) : $BUILT_TAGS_PATH"
-      yq "$BUILT_TAGS_PATH += \"$TAG_VALUE\"" $VALUES_PATH > $VALUES_PATH.tmp
+      yq "$BUILT_TAGS_PATH += [ \"$TAG_VALUE\" ]" $VALUES_PATH > $VALUES_PATH.tmp
       mv $VALUES_PATH.tmp $VALUES_PATH
     workingDir: $(workspaces.gitrepos.path)/$(params.subdirectory)
   - name: prune-built-tags