fixes

orange-cloudfoundry · Aug 11, 2021 · 25d1dfa · 25d1dfa
1 parent 032ed56
commit 25d1dfa
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 24 deletions.
diff --git a/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml
@@ -108,7 +108,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         inputs:
           - name: repackaged-releases-fallback
         run:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml
@@ -189,7 +189,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         inputs:
           - name: repackaged-releases-fallback
         run:
@@ -634,7 +634,7 @@ jobs:
         type: registry-image
         source:
           repository: governmentpaas/curl-ssl
-          tag: f4817cce4038ac072c06507ca9d255392489d967
+          tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
       inputs:
         - name: final-release-manifest
       outputs:
@@ -771,7 +771,7 @@ jobs:
         type: registry-image
         source:
           repository: governmentpaas/curl-ssl
-          tag: f4817cce4038ac072c06507ca9d255392489d967
+          tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
       outputs:
         - name: result-dir
       run:
@@ -839,7 +839,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/bosh-cli-v2
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         inputs:
           - name: scripts-resource
           - name: secrets
@@ -888,7 +888,7 @@ jobs:
         type: registry-image
         source:
           repository: governmentpaas/curl-ssl
-          tag: f4817cce4038ac072c06507ca9d255392489d967
+          tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
       outputs:
         - name: result-dir
       run:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-precompile-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-precompile-generated.yml
@@ -172,7 +172,7 @@ jobs:
             type: registry-image
             source:
               repository: governmentpaas/curl-ssl
-              tag: f4817cce4038ac072c06507ca9d255392489d967
+              tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
           inputs:
             - name: repackaged-releases-fallback
           run:
@@ -267,7 +267,7 @@ jobs:
             type: registry-image
             source:
               repository: orangecloudfoundry/bosh-cli-v2-cf-cli
-              tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1
+              tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7
           inputs:
             - name: stemcell
           outputs:
@@ -297,7 +297,7 @@ jobs:
               type: registry-image
               source:
                 repository: governmentpaas/bosh-cli-v2
-                tag: f4817cce4038ac072c06507ca9d255392489d967
+                tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
             inputs:
               - name: releases-to-upload
               - name: config-resource
@@ -329,7 +329,7 @@ jobs:
             type: registry-image
             source:
               repository: orangecloudfoundry/bosh-cli-v2-cf-cli
-              tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1
+              tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7
           inputs:
             - name: stemcell
             - name: secrets
@@ -387,7 +387,7 @@ jobs:
             type: registry-image
             source:
               repository: orangecloudfoundry/bosh-cli-v2-cf-cli
-              tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1
+              tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7
           inputs:
             - name: stemcell
           outputs:
@@ -417,7 +417,7 @@ jobs:
               type: registry-image
               source:
                 repository: governmentpaas/bosh-cli-v2
-                tag: f4817cce4038ac072c06507ca9d255392489d967
+                tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
             inputs:
               - name: releases-to-upload
               - name: config-resource
@@ -449,7 +449,7 @@ jobs:
             type: registry-image
             source:
               repository: orangecloudfoundry/bosh-cli-v2-cf-cli
-              tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1
+              tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7
           inputs:
             - name: stemcell
             - name: secrets
@@ -507,7 +507,7 @@ jobs:
             type: registry-image
             source:
               repository: orangecloudfoundry/bosh-cli-v2-cf-cli
-              tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1
+              tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7
           inputs:
             - name: stemcell
           outputs:
@@ -537,7 +537,7 @@ jobs:
               type: registry-image
               source:
                 repository: governmentpaas/bosh-cli-v2
-                tag: f4817cce4038ac072c06507ca9d255392489d967
+                tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
             inputs:
               - name: releases-to-upload
               - name: config-resource
@@ -569,7 +569,7 @@ jobs:
             type: registry-image
             source:
               repository: orangecloudfoundry/bosh-cli-v2-cf-cli
-              tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1
+              tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7
           inputs:
             - name: stemcell
             - name: secrets
@@ -628,7 +628,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         outputs:
           - name: result-dir
         run:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml
@@ -76,7 +76,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         outputs:
           - name: result-dir
         run:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml
@@ -162,7 +162,7 @@ jobs:
             type: registry-image
             source:
               repository: governmentpaas/git-ssh
-              tag: f4817cce4038ac072c06507ca9d255392489d967
+              tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
           outputs:
             - name: success-tag
           run:
@@ -186,7 +186,7 @@ jobs:
         type: registry-image
         source:
           repository: governmentpaas/git-ssh
-          tag: f4817cce4038ac072c06507ca9d255392489d967
+          tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
       inputs:
         - name: concourse-micro-success
           optional: true

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-k8s-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-k8s-generated.yml
@@ -279,7 +279,7 @@ jobs:
         type: registry-image
         source:
           repository: governmentpaas/curl-ssl
-          tag: f4817cce4038ac072c06507ca9d255392489d967
+          tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
       outputs:
         - name: result-dir
       run:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-news-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-news-generated.yml
@@ -101,7 +101,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         inputs:
           - name: boshrelease
         outputs:
@@ -158,7 +158,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         inputs:
           - name: boshrelease
         outputs:
@@ -215,7 +215,7 @@ jobs:
           type: registry-image
           source:
             repository: governmentpaas/curl-ssl
-            tag: f4817cce4038ac072c06507ca9d255392489d967
+            tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
         inputs:
           - name: boshrelease
         outputs:

diff --git a/...epository/hello-world-root-depls/k8s-sample/k8s-config/00-check-coa-provided-artifacts.sh b/...epository/hello-world-root-depls/k8s-sample/k8s-config/00-check-coa-provided-artifacts.sh
@@ -29,6 +29,14 @@ else
   echo "Deployment name: $COA_DEPLOYMENT_NAME"
 fi
 
+if [ -z "$COA_ROOT_DEPLOYMENT_NAME" ]; then
+  echo "env COA_ROOT_DEPLOYMENT_NAME is missing"
+  exit 1
+else
+  echo "Deployment name: $COA_ROOT_DEPLOYMENT_NAME"
+fi
+
+
 if [ -z "$IAAS_TYPE" ]; then
   echo "env IAAS_TYPE is missing"
   exit 1

diff --git a/...rence_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/config.yml b/...rence_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/config.yml
@@ -8,3 +8,4 @@ float: #@ data.values.float
 
 auto-injected-by-coa:
   deployment-name: #@ data.values.DEPLOYMENT_NAME
+  root-deployment-name: #@ data.values.ROOT_DEPLOYMENT_NAME
diff --git a/...rence_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/values.yml b/...rence_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/values.yml
@@ -7,3 +7,4 @@ int: 0
 float: 0.0
 
 DEPLOYMENT_NAME: #! This is required to be able to automatically inject value of COA_DEPLOYMENT_NAME using ytt --data-values-env COA
+ROOT_DEPLOYMENT_NAME: #! This is required to be able to automatically inject value of COA_ROOT_DEPLOYMENT_NAME using ytt --data-values-env COA
diff --git a/spec/tasks/execute_k8s_shells/task_spec.rb b/spec/tasks/execute_k8s_shells/task_spec.rb
@@ -99,6 +99,7 @@
         "TASK_RUN_SCRIPT" => "cf-ops-automation/concourse/tasks/execute_k8s_shells/run.sh",
         "FILE_EXECUTION_FILTER" => "[0-9][0-9]-*.sh",
         "COA_DEPLOYMENT_NAME" => nil,
+        "COA_ROOT_DEPLOYMENT_NAME" => nil,
         "CUSTOM_SCRIPT_DIR" => nil,
         "CREDHUB_SERVER" => nil,
         "CREDHUB_CLIENT" => nil,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@ float: #@ data.values.float

		auto-injected-by-coa:
		deployment-name: #@ data.values.DEPLOYMENT_NAME
		root-deployment-name: #@ data.values.ROOT_DEPLOYMENT_NAME
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ int: 0
		float: 0.0

		DEPLOYMENT_NAME: #! This is required to be able to automatically inject value of COA_DEPLOYMENT_NAME using ytt --data-values-env COA
		ROOT_DEPLOYMENT_NAME: #! This is required to be able to automatically inject value of COA_ROOT_DEPLOYMENT_NAME using ytt --data-values-env COA