Skip to content

Commit

Permalink
Merge pull request #3398 from alphagov/186000411-upgrade-cf-32.7.0
Browse files Browse the repository at this point in the history
Upgrade cloud foundry to version 32.7.0
  • Loading branch information
risicle committed Sep 19, 2023
2 parents 78844cd + 5cee5f1 commit e3a6986
Show file tree
Hide file tree
Showing 37 changed files with 71 additions and 69 deletions.
40 changes: 20 additions & 20 deletions concourse/pipelines/create-cloudfoundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,72 +11,72 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
psql: &psql-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/psql
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
node: &node-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/node
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
node-chromium: &node-chromium-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/node-chromium
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
awscli: &awscli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
cf-acceptance-tests: &cf-acceptance-tests-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
cf-cli: &cf-cli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
cf-uaac: &cf-uaac-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
git-ssh: &git-ssh-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/git-ssh
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
ruby-slim: &ruby-slim-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
golang: &golang-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/golang
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
curl-ssl: &curl-ssl-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/curl-ssl
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d


tasks:
Expand Down Expand Up @@ -272,7 +272,7 @@ resource_types:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/concourse-pool-resource
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

- name: s3-iam
type: registry-image
Expand Down Expand Up @@ -543,13 +543,13 @@ resources:
type: git
source:
uri: https://github.com/cloudfoundry/cf-acceptance-tests
branch: cf32.1
branch: cf32.7

- name: cf-smoke-tests-release
type: git
source:
uri: https://github.com/cloudfoundry/cf-smoke-tests-release
tag_filter: "42.0.88"
tag_filter: "42.0.93"
submodules:
- "src/smoke_tests"

Expand Down Expand Up @@ -822,7 +822,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: paas-cf
Expand Down Expand Up @@ -5386,7 +5386,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/spruce
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: paas-cf
Expand Down Expand Up @@ -6647,7 +6647,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: passwords
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/deployment-kick-off.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: deployment-timer
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

run:
path: ./paas-cf/concourse/scripts/rds_instances.sh
Expand All @@ -86,7 +86,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: paas-cf
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: paas-cf
Expand Down
10 changes: 5 additions & 5 deletions concourse/pipelines/destroy-cloudfoundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: paas-cf
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: config
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: bosh-vars-store
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: cf-tfstate
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: terraform-variables
Expand Down
6 changes: 3 additions & 3 deletions concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
params:
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
run:
path: bash
args:
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
run:
path: bash
args:
Expand Down
4 changes: 2 additions & 2 deletions concourse/pipelines/monitor-remote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resources:
type: git
source:
uri: https://github.com/cloudfoundry/cf-smoke-tests-release
tag_filter: "42.0.88"
tag_filter: "42.0.93"
submodules:
- "src/smoke_tests"

Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

inputs:
- name: paas-cf
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/test-certificate-rotation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

cf-acceptance-tests: &cf-acceptance-tests-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d

cf-cli: &cf-cli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d


resource_types:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/aiven-broker-acceptance-tests-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: test-config
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/app-autoscaler-acceptance-tests-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: admin-creds
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-az-is-enabled-in-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
params:
DEPLOY_ENV:
BOSH_ENVIRONMENT:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-az-is-enabled-in-vpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
params:
AWS_DEFAULT_REGION:
EXPECTED_ACL_NAME:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-billing-comparison-with-cf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-billing
params:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/configure-grafana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-trusted-people
run:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/create_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: cf-manifest
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/create_nonadmin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
outputs:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/cronitor-monitor-ping-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
run:
path: sh
args:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/curl-az-healthcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/curl-ssl
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
params:
AVAILABILITY_ZONE:
ENABLE_AZ_HEALTHCHECK:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/custom-acceptance-tests-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
inputs:
- name: paas-cf
- name: test-config
Expand Down
Loading

0 comments on commit e3a6986

Please sign in to comment.