From 1df0208987f3d195bd279980522785513bdbde87 Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Wed, 11 Aug 2021 16:53:29 +0200 Subject: [PATCH] bump to latest gov.uk images this include the following bump: - bosh cli 6.4.4 - alpine to 3.13 (or 3.12 is kept) - credhub-cli 2.9 - etc... We bump to latest docker images from alphagov and orange-cf: * bump to governmentpaas/[bosh-cli-v2,cf-cli, curl-ssl, git-ssh, spruce]: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb * bump to orangecloudfoundry/terraform,k8s-tools and bosh-cli-v2-cf-cli to e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 --- ci/pipeline.yml | 2 +- .../bootstrap-all-init-pipelines.yml | 8 +++---- concourse/pipelines/control-plane.yml | 12 +++++----- .../pipelines/micro-bosh-init-pipeline.yml | 2 +- concourse/pipelines/sync-feature-branches.yml | 8 +++---- .../pipelines/template/bosh-pipeline.yml.erb | 8 +++---- .../template/bosh-precompile-pipeline.yml.erb | 14 ++++++------ .../template/cf-apps-pipeline.yml.erb | 2 +- .../template/concourse-pipeline.yml.erb | 4 ++-- .../pipelines/template/k8s-pipeline.yml.erb | 3 ++- .../pipelines/template/news-pipeline.yml.erb | 2 +- .../apply_iaas_type_and_profiles/task.yml | 2 +- .../tasks/bosh_cancel_all_tasks/task.yml | 2 +- concourse/tasks/bosh_delete_apply/task.yml | 2 +- concourse/tasks/bosh_delete_plan/task.yml | 2 +- concourse/tasks/bosh_interpolate/task.yml | 2 +- concourse/tasks/bosh_update_config/task.yml | 2 +- concourse/tasks/bosh_upload_releases/task.yml | 2 +- concourse/tasks/bosh_upload_stemcell/task.yml | 2 +- concourse/tasks/bosh_variables/task.yml | 2 +- concourse/tasks/cf_push.yml | 2 +- concourse/tasks/check_configuration/task.yml | 2 +- .../tasks/copy_deployment_required_files.yml | 2 +- concourse/tasks/download_stemcell/task.yml | 2 +- concourse/tasks/execute_deploy_script.yml | 2 +- concourse/tasks/execute_k8s_shells/task.yml | 2 +- concourse/tasks/fly_execute_commands.yml | 2 +- concourse/tasks/generate_manifest/task.yml | 2 +- .../git_append_a_dir_from_generated/task.yml | 2 +- concourse/tasks/git_hard_reset_wip/task.yml | 2 +- concourse/tasks/git_rebase_status/task.yml | 2 +- concourse/tasks/git_reset_wip.yml | 2 +- concourse/tasks/git_squash_branches/task.yml | 2 +- .../tasks/git_update_a_dir_from_generated.yml | 2 +- .../git_update_a_file_from_generated.yml | 2 +- .../git_update_all_files_from_generated.yml | 2 +- concourse/tasks/post_bosh_deploy.yml | 2 +- concourse/tasks/pre_bosh_deploy.yml | 2 +- .../task.yml | 2 +- .../tasks/repackage_boshreleases/task.yml | 2 +- .../repackage_boshreleases_fallback/task.yml | 2 +- .../tasks/resolve_manifest_versions/task.yml | 2 +- .../tasks/s3_boshreleases_upload/task.yml | 2 +- .../tasks/s3_missing_boshreleases/task.yml | 2 +- concourse/tasks/s3_stemcells_upload/task.yml | 2 +- .../tasks/terraform_apply_cloudfoundry.yml | 2 +- .../tasks/terraform_plan_cloudfoundry.yml | 2 +- ...nother-world-root-depls-bosh-generated.yml | 2 +- .../hello-world-root-depls-bosh-generated.yml | 10 ++++----- ...d-root-depls-bosh-precompile-generated.yml | 22 +++++++++---------- ...llo-world-root-depls-cf-apps-generated.yml | 2 +- ...o-world-root-depls-concourse-generated.yml | 4 ++-- .../hello-world-root-depls-k8s-generated.yml | 2 +- .../hello-world-root-depls-news-generated.yml | 6 ++--- .../00-check-coa-provided-artifacts.sh | 8 +++++++ .../k8s-sample/k8s-config/config.yml | 1 + .../k8s-sample/k8s-config/values.yml | 1 + .../docker-image-vars.yml | 2 +- ...e_processor_for_concourse_pipeline_spec.rb | 4 ++-- .../references/apps-depls-cf-apps-ref.yml | 2 +- .../references/delete-depls-bosh-ref.yml | 2 +- .../fixtures/references/empty-depls.yml | 2 +- .../simple-depls-bosh-precompile-ref.yml | 16 +++++++------- .../references/simple-depls-bosh-ref.yml | 10 ++++----- .../references/simple-depls-k8s-ref.yml | 3 ++- .../references/simple-depls-news-ref.yml | 4 ++-- spec/tasks/execute_k8s_shells/task_spec.rb | 1 + spec/tasks/task_spec_helper.rb | 8 +++---- .../terraform_plan_cloudfoundry/task_spec.rb | 2 +- 69 files changed, 131 insertions(+), 120 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 02edc825b..a2075c237 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -365,7 +365,7 @@ jobs: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: cf-ops-automation params: diff --git a/concourse/pipelines/bootstrap-all-init-pipelines.yml b/concourse/pipelines/bootstrap-all-init-pipelines.yml index 2813c7540..383ed7044 100644 --- a/concourse/pipelines/bootstrap-all-init-pipelines.yml +++ b/concourse/pipelines/bootstrap-all-init-pipelines.yml @@ -184,7 +184,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: final-control-plane-pipeline - name: secrets-full @@ -251,7 +251,7 @@ jobs: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: secrets @@ -346,7 +346,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: concourse-teams outputs: @@ -432,7 +432,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: all-pipelines outputs: diff --git a/concourse/pipelines/control-plane.yml b/concourse/pipelines/control-plane.yml index 2a8ab0a0b..045ab6141 100644 --- a/concourse/pipelines/control-plane.yml +++ b/concourse/pipelines/control-plane.yml @@ -130,7 +130,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: concourse-micro run: @@ -284,7 +284,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: config-resource run: @@ -311,7 +311,7 @@ jobs: source: # from https://hub.docker.com/r/governmentpaas/git-ssh/tags repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: success-tag run: @@ -337,7 +337,7 @@ jobs: source: # from https://hub.docker.com/r/governmentpaas/git-ssh/tags repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: concourse-micro-success optional: true @@ -417,7 +417,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: secrets-writer outputs: @@ -463,7 +463,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: paas-templates-full outputs: diff --git a/concourse/pipelines/micro-bosh-init-pipeline.yml b/concourse/pipelines/micro-bosh-init-pipeline.yml index 4d3e8e304..80b6b5dae 100644 --- a/concourse/pipelines/micro-bosh-init-pipeline.yml +++ b/concourse/pipelines/micro-bosh-init-pipeline.yml @@ -89,7 +89,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/terraform - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: spec-resource - name: terraform-tfvars diff --git a/concourse/pipelines/sync-feature-branches.yml b/concourse/pipelines/sync-feature-branches.yml index 9340abcd0..8e87feb04 100644 --- a/concourse/pipelines/sync-feature-branches.yml +++ b/concourse/pipelines/sync-feature-branches.yml @@ -100,7 +100,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb platform: linux inputs: - name: paas-templates-features @@ -184,7 +184,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb platform: linux inputs: - name: rebased-wip @@ -264,7 +264,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb platform: linux inputs: - name: paas-templates-features-reseted @@ -324,7 +324,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: cf-ops-automation diff --git a/concourse/pipelines/template/bosh-pipeline.yml.erb b/concourse/pipelines/template/bosh-pipeline.yml.erb index ed3094837..26b3eeb0f 100755 --- a/concourse/pipelines/template/bosh-pipeline.yml.erb +++ b/concourse/pipelines/template/bosh-pipeline.yml.erb @@ -351,7 +351,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: repackaged-releases-fallback run: @@ -832,7 +832,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: final-release-manifest outputs: @@ -1006,7 +1006,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: @@ -1055,7 +1055,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/concourse/pipelines/template/bosh-precompile-pipeline.yml.erb b/concourse/pipelines/template/bosh-precompile-pipeline.yml.erb index 8cb8c4791..ec80891bb 100644 --- a/concourse/pipelines/template/bosh-precompile-pipeline.yml.erb +++ b/concourse/pipelines/template/bosh-precompile-pipeline.yml.erb @@ -274,7 +274,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: repackaged-releases-fallback run: @@ -408,7 +408,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: stemcell outputs: @@ -439,7 +439,7 @@ jobs: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: releases-to-upload - name: config-resource @@ -472,7 +472,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: release - name: stemcell @@ -568,7 +568,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: compiled-release - name: secrets @@ -612,7 +612,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/concourse/pipelines/template/cf-apps-pipeline.yml.erb b/concourse/pipelines/template/cf-apps-pipeline.yml.erb index 52acbe647..6a3b4fba5 100755 --- a/concourse/pipelines/template/cf-apps-pipeline.yml.erb +++ b/concourse/pipelines/template/cf-apps-pipeline.yml.erb @@ -101,7 +101,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/concourse/pipelines/template/concourse-pipeline.yml.erb b/concourse/pipelines/template/concourse-pipeline.yml.erb index f4219c84e..9fe130987 100644 --- a/concourse/pipelines/template/concourse-pipeline.yml.erb +++ b/concourse/pipelines/template/concourse-pipeline.yml.erb @@ -215,7 +215,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: success-tag run: @@ -240,7 +240,7 @@ jobs: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: concourse-micro-success optional: true diff --git a/concourse/pipelines/template/k8s-pipeline.yml.erb b/concourse/pipelines/template/k8s-pipeline.yml.erb index 61826a40c..0b7e35664 100755 --- a/concourse/pipelines/template/k8s-pipeline.yml.erb +++ b/concourse/pipelines/template/k8s-pipeline.yml.erb @@ -335,6 +335,7 @@ jobs: file: cf-ops-automation/concourse/tasks/execute_k8s_shells/task.yml params: COA_DEPLOYMENT_NAME: <%= name %> + COA_ROOT_DEPLOYMENT_NAME: <%= root_deployment_name %> CUSTOM_SCRIPT_DIR: paas-templates-resource/<%= root_deployment_name %>/<%= name %>/k8s-config CREDHUB_SERVER: ((credhub-server)) CREDHUB_CLIENT: ((credhub-client)) @@ -393,7 +394,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/concourse/pipelines/template/news-pipeline.yml.erb b/concourse/pipelines/template/news-pipeline.yml.erb index 7ed0ac566..82578d259 100755 --- a/concourse/pipelines/template/news-pipeline.yml.erb +++ b/concourse/pipelines/template/news-pipeline.yml.erb @@ -132,7 +132,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: boshrelease outputs: diff --git a/concourse/tasks/apply_iaas_type_and_profiles/task.yml b/concourse/tasks/apply_iaas_type_and_profiles/task.yml index af8942822..65cd5d0f6 100644 --- a/concourse/tasks/apply_iaas_type_and_profiles/task.yml +++ b/concourse/tasks/apply_iaas_type_and_profiles/task.yml @@ -3,7 +3,7 @@ image_resource: type: registry-image source: repository: orangecloudfoundry/k8s-tools - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: paas-templates-resource - name: cf-ops-automation diff --git a/concourse/tasks/bosh_cancel_all_tasks/task.yml b/concourse/tasks/bosh_cancel_all_tasks/task.yml index 6be3682ef..c7d8e13a0 100644 --- a/concourse/tasks/bosh_cancel_all_tasks/task.yml +++ b/concourse/tasks/bosh_cancel_all_tasks/task.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: secrets diff --git a/concourse/tasks/bosh_delete_apply/task.yml b/concourse/tasks/bosh_delete_apply/task.yml index 7c22f0d61..0d7ea9ddd 100644 --- a/concourse/tasks/bosh_delete_apply/task.yml +++ b/concourse/tasks/bosh_delete_apply/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: config-resource diff --git a/concourse/tasks/bosh_delete_plan/task.yml b/concourse/tasks/bosh_delete_plan/task.yml index 3d8e42cdd..6a0f36983 100644 --- a/concourse/tasks/bosh_delete_plan/task.yml +++ b/concourse/tasks/bosh_delete_plan/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: config-resource diff --git a/concourse/tasks/bosh_interpolate/task.yml b/concourse/tasks/bosh_interpolate/task.yml index fd4c8534e..be79353c6 100644 --- a/concourse/tasks/bosh_interpolate/task.yml +++ b/concourse/tasks/bosh_interpolate/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: bosh-inputs - name: manifest-dir diff --git a/concourse/tasks/bosh_update_config/task.yml b/concourse/tasks/bosh_update_config/task.yml index 6707ed0a6..0c47c9e7b 100644 --- a/concourse/tasks/bosh_update_config/task.yml +++ b/concourse/tasks/bosh_update_config/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: config-manifest - name: secrets diff --git a/concourse/tasks/bosh_upload_releases/task.yml b/concourse/tasks/bosh_upload_releases/task.yml index 24b45f7a7..c293b3b77 100644 --- a/concourse/tasks/bosh_upload_releases/task.yml +++ b/concourse/tasks/bosh_upload_releases/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: releases-to-upload - name: config-resource diff --git a/concourse/tasks/bosh_upload_stemcell/task.yml b/concourse/tasks/bosh_upload_stemcell/task.yml index 47cf4ac09..7934884da 100644 --- a/concourse/tasks/bosh_upload_stemcell/task.yml +++ b/concourse/tasks/bosh_upload_stemcell/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: stemcell - name: config-resource diff --git a/concourse/tasks/bosh_variables/task.yml b/concourse/tasks/bosh_variables/task.yml index 018ea49dc..ccaa84ee9 100644 --- a/concourse/tasks/bosh_variables/task.yml +++ b/concourse/tasks/bosh_variables/task.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: secrets # required for certificates injection diff --git a/concourse/tasks/cf_push.yml b/concourse/tasks/cf_push.yml index c81bad30e..2e5a22d89 100644 --- a/concourse/tasks/cf_push.yml +++ b/concourse/tasks/cf_push.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/cf-cli - tag: 0cba745d6d0e417423bd651beeda6b896687429a + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: credentials-resource diff --git a/concourse/tasks/check_configuration/task.yml b/concourse/tasks/check_configuration/task.yml index 07a2b0aab..18607bb58 100644 --- a/concourse/tasks/check_configuration/task.yml +++ b/concourse/tasks/check_configuration/task.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/spruce - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: config-resource diff --git a/concourse/tasks/copy_deployment_required_files.yml b/concourse/tasks/copy_deployment_required_files.yml index 52880ae71..152a2b347 100644 --- a/concourse/tasks/copy_deployment_required_files.yml +++ b/concourse/tasks/copy_deployment_required_files.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: template-resource diff --git a/concourse/tasks/download_stemcell/task.yml b/concourse/tasks/download_stemcell/task.yml index 036db7a24..c5d22cf04 100644 --- a/concourse/tasks/download_stemcell/task.yml +++ b/concourse/tasks/download_stemcell/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/awscli - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: templates-resource outputs: diff --git a/concourse/tasks/execute_deploy_script.yml b/concourse/tasks/execute_deploy_script.yml index 24ced9d08..9140da309 100644 --- a/concourse/tasks/execute_deploy_script.yml +++ b/concourse/tasks/execute_deploy_script.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: templates diff --git a/concourse/tasks/execute_k8s_shells/task.yml b/concourse/tasks/execute_k8s_shells/task.yml index 195d07d24..9611af832 100644 --- a/concourse/tasks/execute_k8s_shells/task.yml +++ b/concourse/tasks/execute_k8s_shells/task.yml @@ -3,7 +3,7 @@ image_resource: type: registry-image source: repository: orangecloudfoundry/k8s-tools - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: paas-templates-resource - name: credentials-resource diff --git a/concourse/tasks/fly_execute_commands.yml b/concourse/tasks/fly_execute_commands.yml index bf9e92c69..8958a190d 100644 --- a/concourse/tasks/fly_execute_commands.yml +++ b/concourse/tasks/fly_execute_commands.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: fly-cmd outputs: diff --git a/concourse/tasks/generate_manifest/task.yml b/concourse/tasks/generate_manifest/task.yml index 1fecca5f1..1211c321e 100644 --- a/concourse/tasks/generate_manifest/task.yml +++ b/concourse/tasks/generate_manifest/task.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/spruce - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: credentials-resource diff --git a/concourse/tasks/git_append_a_dir_from_generated/task.yml b/concourse/tasks/git_append_a_dir_from_generated/task.yml index 5cf5128e5..d5ade157f 100644 --- a/concourse/tasks/git_append_a_dir_from_generated/task.yml +++ b/concourse/tasks/git_append_a_dir_from_generated/task.yml @@ -16,7 +16,7 @@ image_resource: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: generated-resource diff --git a/concourse/tasks/git_hard_reset_wip/task.yml b/concourse/tasks/git_hard_reset_wip/task.yml index 9bd2df141..deae81655 100644 --- a/concourse/tasks/git_hard_reset_wip/task.yml +++ b/concourse/tasks/git_hard_reset_wip/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: cf-ops-automation diff --git a/concourse/tasks/git_rebase_status/task.yml b/concourse/tasks/git_rebase_status/task.yml index 0faa918d8..4ef5aa759 100644 --- a/concourse/tasks/git_rebase_status/task.yml +++ b/concourse/tasks/git_rebase_status/task.yml @@ -16,7 +16,7 @@ image_resource: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: cf-ops-automation diff --git a/concourse/tasks/git_reset_wip.yml b/concourse/tasks/git_reset_wip.yml index ea92afe92..9f7efbcf7 100644 --- a/concourse/tasks/git_reset_wip.yml +++ b/concourse/tasks/git_reset_wip.yml @@ -18,7 +18,7 @@ image_resource: source: # from https://hub.docker.com/r/governmentpaas/git-ssh/tags repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource outputs: diff --git a/concourse/tasks/git_squash_branches/task.yml b/concourse/tasks/git_squash_branches/task.yml index 0ce576da3..b34034ccd 100644 --- a/concourse/tasks/git_squash_branches/task.yml +++ b/concourse/tasks/git_squash_branches/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: cf-ops-automation diff --git a/concourse/tasks/git_update_a_dir_from_generated.yml b/concourse/tasks/git_update_a_dir_from_generated.yml index 7cc3c44c2..580042ee2 100644 --- a/concourse/tasks/git_update_a_dir_from_generated.yml +++ b/concourse/tasks/git_update_a_dir_from_generated.yml @@ -15,7 +15,7 @@ platform: linux image_resource: type: registry-image - source: {repository: governmentpaas/git-ssh, tag: f4817cce4038ac072c06507ca9d255392489d967} + source: {repository: governmentpaas/git-ssh, tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb} inputs: - name: reference-resource - name: generated-resource diff --git a/concourse/tasks/git_update_a_file_from_generated.yml b/concourse/tasks/git_update_a_file_from_generated.yml index 37df8fa23..930d0dc04 100644 --- a/concourse/tasks/git_update_a_file_from_generated.yml +++ b/concourse/tasks/git_update_a_file_from_generated.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: generated-resource diff --git a/concourse/tasks/git_update_all_files_from_generated.yml b/concourse/tasks/git_update_all_files_from_generated.yml index 903882d25..49b8b5b6c 100644 --- a/concourse/tasks/git_update_all_files_from_generated.yml +++ b/concourse/tasks/git_update_all_files_from_generated.yml @@ -18,7 +18,7 @@ image_resource: source: # from https://hub.docker.com/r/governmentpaas/git-ssh/tags repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: reference-resource - name: generated-resource diff --git a/concourse/tasks/post_bosh_deploy.yml b/concourse/tasks/post_bosh_deploy.yml index 805e2db25..5d44f32f0 100644 --- a/concourse/tasks/post_bosh_deploy.yml +++ b/concourse/tasks/post_bosh_deploy.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: governmentpaas/cf-cli - tag: 0cba745d6d0e417423bd651beeda6b896687429a + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: scripts-resource - name: template-resource diff --git a/concourse/tasks/pre_bosh_deploy.yml b/concourse/tasks/pre_bosh_deploy.yml index aadff7edc..5c997271f 100644 --- a/concourse/tasks/pre_bosh_deploy.yml +++ b/concourse/tasks/pre_bosh_deploy.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: scripts-resource - name: template-resource diff --git a/concourse/tasks/reformat_expected_boshreleases_list/task.yml b/concourse/tasks/reformat_expected_boshreleases_list/task.yml index 8aea9fc03..e2523b62e 100644 --- a/concourse/tasks/reformat_expected_boshreleases_list/task.yml +++ b/concourse/tasks/reformat_expected_boshreleases_list/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: templates-resource outputs: diff --git a/concourse/tasks/repackage_boshreleases/task.yml b/concourse/tasks/repackage_boshreleases/task.yml index 7235b62a3..9ec207df3 100644 --- a/concourse/tasks/repackage_boshreleases/task.yml +++ b/concourse/tasks/repackage_boshreleases/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: cf-ops-automation - name: templates-resource diff --git a/concourse/tasks/repackage_boshreleases_fallback/task.yml b/concourse/tasks/repackage_boshreleases_fallback/task.yml index f4b5968c4..be1360aad 100644 --- a/concourse/tasks/repackage_boshreleases_fallback/task.yml +++ b/concourse/tasks/repackage_boshreleases_fallback/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: cf-ops-automation - name: repackaged-releases diff --git a/concourse/tasks/resolve_manifest_versions/task.yml b/concourse/tasks/resolve_manifest_versions/task.yml index 93b5b4805..4eb693d43 100644 --- a/concourse/tasks/resolve_manifest_versions/task.yml +++ b/concourse/tasks/resolve_manifest_versions/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: templates-resource - name: manifest-dir diff --git a/concourse/tasks/s3_boshreleases_upload/task.yml b/concourse/tasks/s3_boshreleases_upload/task.yml index f2beb84c4..7974cef01 100644 --- a/concourse/tasks/s3_boshreleases_upload/task.yml +++ b/concourse/tasks/s3_boshreleases_upload/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/awscli - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: local-files-dir - name: templates-resource diff --git a/concourse/tasks/s3_missing_boshreleases/task.yml b/concourse/tasks/s3_missing_boshreleases/task.yml index dfdfddc5f..8fdb74364 100644 --- a/concourse/tasks/s3_missing_boshreleases/task.yml +++ b/concourse/tasks/s3_missing_boshreleases/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/awscli - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: templates-resource - name: expected-boshreleases diff --git a/concourse/tasks/s3_stemcells_upload/task.yml b/concourse/tasks/s3_stemcells_upload/task.yml index bd2e9ff87..7798cc397 100644 --- a/concourse/tasks/s3_stemcells_upload/task.yml +++ b/concourse/tasks/s3_stemcells_upload/task.yml @@ -17,7 +17,7 @@ image_resource: type: registry-image source: repository: governmentpaas/awscli - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: templates-resource outputs: diff --git a/concourse/tasks/terraform_apply_cloudfoundry.yml b/concourse/tasks/terraform_apply_cloudfoundry.yml index 987f159b9..49fdc1036 100644 --- a/concourse/tasks/terraform_apply_cloudfoundry.yml +++ b/concourse/tasks/terraform_apply_cloudfoundry.yml @@ -17,7 +17,7 @@ platform: linux image_resource: type: registry-image # Maintained in https://github.com/orange-cloudfoundry/paas-docker-cloudfoundry-tools - source: {repository: orangecloudfoundry/terraform, tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1} + source: {repository: orangecloudfoundry/terraform, tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7} inputs: - name: secret-state-resource diff --git a/concourse/tasks/terraform_plan_cloudfoundry.yml b/concourse/tasks/terraform_plan_cloudfoundry.yml index 42e1fcb80..c21262874 100644 --- a/concourse/tasks/terraform_plan_cloudfoundry.yml +++ b/concourse/tasks/terraform_plan_cloudfoundry.yml @@ -17,7 +17,7 @@ platform: linux image_resource: type: registry-image # Maintained in https://github.com/orange-cloudfoundry/paas-docker-cloudfoundry-tools - source: {repository: orangecloudfoundry/terraform, tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1} + source: {repository: orangecloudfoundry/terraform, tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7} inputs: - name: secret-state-resource 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 index 0b208854d..bab1fd7a0 100644 --- 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 index c1c63165d..29ac8dfa9 100644 --- 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 index 8247eedc8..42c801d31 100644 --- 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 index a6ed96eb7..eb8763a59 100644 --- 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 index f5fc3f012..d1beb8059 100644 --- 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 index 6dfbd74df..96fb31855 100644 --- 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 index 17a9ebd3c..a12901646 100644 --- 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/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/00-check-coa-provided-artifacts.sh b/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/00-check-coa-provided-artifacts.sh index 7bdccde53..c6e6164c1 100755 --- a/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/00-check-coa-provided-artifacts.sh +++ b/docs/reference_dataset/template_repository/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/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/config.yml b/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/config.yml index 7ff409c5e..f562a24eb 100644 --- a/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/config.yml +++ b/docs/reference_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/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/values.yml b/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/values.yml index e7edddce2..ff1450946 100644 --- a/docs/reference_dataset/template_repository/hello-world-root-depls/k8s-sample/k8s-config/values.yml +++ b/docs/reference_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/docs/reference_dataset/template_repository/hello-world-root-depls/pipeline-sample/concourse-pipeline-config/docker-image-vars.yml b/docs/reference_dataset/template_repository/hello-world-root-depls/pipeline-sample/concourse-pipeline-config/docker-image-vars.yml index 09cdfeb68..1c65b8cfe 100644 --- a/docs/reference_dataset/template_repository/hello-world-root-depls/pipeline-sample/concourse-pipeline-config/docker-image-vars.yml +++ b/docs/reference_dataset/template_repository/hello-world-root-depls/pipeline-sample/concourse-pipeline-config/docker-image-vars.yml @@ -1,2 +1,2 @@ docker-image-repository: governmentpaas/bosh-cli-v2 -docker-image-tag: f4817cce4038ac072c06507ca9d255392489d967 +docker-image-tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb diff --git a/spec/lib/template_processor/template_processor_for_concourse_pipeline_spec.rb b/spec/lib/template_processor/template_processor_for_concourse_pipeline_spec.rb index 31818a7ae..fff3b2d43 100644 --- a/spec/lib/template_processor/template_processor_for_concourse_pipeline_spec.rb +++ b/spec/lib/template_processor/template_processor_for_concourse_pipeline_spec.rb @@ -448,7 +448,7 @@ type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: success-tag run: @@ -470,7 +470,7 @@ type: registry-image source: repository: governmentpaas/git-ssh - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: success-tag run: diff --git a/spec/scripts/generate-depls/fixtures/references/apps-depls-cf-apps-ref.yml b/spec/scripts/generate-depls/fixtures/references/apps-depls-cf-apps-ref.yml index 68075c41b..c00cd0f8e 100644 --- a/spec/scripts/generate-depls/fixtures/references/apps-depls-cf-apps-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/apps-depls-cf-apps-ref.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/spec/scripts/generate-depls/fixtures/references/delete-depls-bosh-ref.yml b/spec/scripts/generate-depls/fixtures/references/delete-depls-bosh-ref.yml index 8378a4e64..484f35eae 100644 --- a/spec/scripts/generate-depls/fixtures/references/delete-depls-bosh-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/delete-depls-bosh-ref.yml @@ -126,7 +126,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: repackaged-releases-fallback run: diff --git a/spec/scripts/generate-depls/fixtures/references/empty-depls.yml b/spec/scripts/generate-depls/fixtures/references/empty-depls.yml index 2243433cf..4fafc2f3b 100644 --- a/spec/scripts/generate-depls/fixtures/references/empty-depls.yml +++ b/spec/scripts/generate-depls/fixtures/references/empty-depls.yml @@ -111,7 +111,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: repackaged-releases-fallback run: diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml index 02e378657..191a27fb9 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-precompile-ref.yml @@ -163,7 +163,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: repackaged-releases-fallback run: @@ -264,7 +264,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: stemcell outputs: @@ -294,7 +294,7 @@ jobs: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: releases-to-upload - name: config-resource @@ -324,7 +324,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: stemcell - name: secrets @@ -377,7 +377,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: stemcell outputs: @@ -407,7 +407,7 @@ jobs: type: registry-image source: repository: governmentpaas/bosh-cli-v2 - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: releases-to-upload - name: config-resource @@ -437,7 +437,7 @@ jobs: type: registry-image source: repository: orangecloudfoundry/bosh-cli-v2-cf-cli - tag: 8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1 + tag: e52d0924aa2dc367e078fdb5ff19eecab1b16ed7 inputs: - name: stemcell - name: secrets @@ -490,7 +490,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml index 5fff53e93..4ddd641ff 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-depls-bosh-ref.yml @@ -200,7 +200,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: repackaged-releases-fallback run: @@ -565,7 +565,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: final-release-manifest outputs: @@ -770,7 +770,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: final-release-manifest outputs: @@ -900,7 +900,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: @@ -944,7 +944,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml index bc1a3e28a..c03be0cd2 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml @@ -221,6 +221,7 @@ jobs: file: cf-ops-automation/concourse/tasks/execute_k8s_shells/task.yml params: COA_DEPLOYMENT_NAME: k8s-sample + COA_ROOT_DEPLOYMENT_NAME: simple-depls CUSTOM_SCRIPT_DIR: paas-templates-resource/simple-depls/k8s-sample/k8s-config CREDHUB_SERVER: ((credhub-server)) CREDHUB_CLIENT: ((credhub-client)) @@ -274,7 +275,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb outputs: - name: result-dir run: diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-news-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-news-ref.yml index 7a0b65652..14e70b400 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-depls-news-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-depls-news-ref.yml @@ -88,7 +88,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: boshrelease outputs: @@ -145,7 +145,7 @@ jobs: type: registry-image source: repository: governmentpaas/curl-ssl - tag: f4817cce4038ac072c06507ca9d255392489d967 + tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb inputs: - name: boshrelease outputs: diff --git a/spec/tasks/execute_k8s_shells/task_spec.rb b/spec/tasks/execute_k8s_shells/task_spec.rb index 1d3d93c02..f805c973a 100644 --- 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, diff --git a/spec/tasks/task_spec_helper.rb b/spec/tasks/task_spec_helper.rb index 0318c88ee..8caf37fa8 100644 --- a/spec/tasks/task_spec_helper.rb +++ b/spec/tasks/task_spec_helper.rb @@ -13,11 +13,11 @@ def self.alpine_image_version end def self.orange_default_image_version - '8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1' + 'e52d0924aa2dc367e078fdb5ff19eecab1b16ed7' end def self.governmentpaas_default_image_version - 'f4817cce4038ac072c06507ca9d255392489d967' + '469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb' end def self.curl_image @@ -50,7 +50,6 @@ def self.bosh_cli_v2_image def self.bosh_cli_v2_image_version governmentpaas_default_image_version - 'f4817cce4038ac072c06507ca9d255392489d967' end def self.k8s_tools_image @@ -66,8 +65,7 @@ def self.cf_cli_image end def self.cf_cli_image_version - # governmentpaas_default_image_version - '0cba745d6d0e417423bd651beeda6b896687429a' + governmentpaas_default_image_version end def self.spruce_image diff --git a/spec/tasks/terraform_plan_cloudfoundry/task_spec.rb b/spec/tasks/terraform_plan_cloudfoundry/task_spec.rb index 86ce95237..9c3c13fb5 100644 --- a/spec/tasks/terraform_plan_cloudfoundry/task_spec.rb +++ b/spec/tasks/terraform_plan_cloudfoundry/task_spec.rb @@ -2,7 +2,7 @@ require 'tmpdir' describe 'terraform_plan_cloudfoundry task' do - EXPECTED_TERRAFORM_IMAGE_TAG = '8d4bfff7a4aff1d88caff6bd5b78e2d34981d4f1'.freeze + EXPECTED_TERRAFORM_IMAGE_TAG = 'e52d0924aa2dc367e078fdb5ff19eecab1b16ed7'.freeze EXPECTED_TERRAFORM_VERSION = '0.11.14'.freeze EXPECTED_PROVIDER_CLOUDFOUNDRY_VERSION = 'v0.11.2'.freeze SKIP_TMP_FILE_CLEANUP = false