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
orange-cloudfoundry · Aug 12, 2021 · 1df0208 · 1df0208
1 parent 5201393
commit 1df0208
Show file tree

Hide file tree

Showing 69 changed files with 131 additions and 120 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: governmentpaas/spruce
-    tag: f4817cce4038ac072c06507ca9d255392489d967
+    tag: 469ceea7a619b0abdd6cb27efd4d3bd5e9be3ddb
 inputs:
   - name: scripts-resource
   - name: config-resource