Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade bosh, awscpi, node-exporter and docker images. Switch to using compiled bosh packages. #639

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Upgrade bosh, awscpi, node-exporter and docker images. Switch to using compiled bosh packages. #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a208a17
Upgrades:
corlettb Aug 15, 2023
83441de
We are now using Jammy so we can switch to the compiled versions
corlettb Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion concourse/pipelines/concourse-lite-self-terminate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7

resources:
- name: delete-timer
Expand Down
24 changes: 14 additions & 10 deletions concourse/pipelines/create-bosh-concourse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,47 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
awscli: &awscli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
certstrap: &certstrap-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/certstrap
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
git-ssh: &git-ssh-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/git-ssh
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
ruby-slim: &ruby-slim-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
self-update-pipelines: &self-update-pipelines-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
spruce: &spruce-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/spruce
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7

groups:
- name: all
Expand Down Expand Up @@ -102,7 +102,7 @@ resource_types:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/keyval-resource
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7

resources:
- name: paas-bootstrap
Expand Down Expand Up @@ -1200,6 +1200,10 @@ jobs:
cp bosh-manifest/bosh-manifest.yml bosh-init-working-dir/bosh-manifest.yml
cp bosh-init-state/"${BOSH_MANIFEST_STATE}" bosh-init-working-dir/bosh-manifest-state.json

# uncomment if you want to force a bosh recreate each time
# RANDOM=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 20 | head -n 1)
# yq -i ".tags.random = \"${RANDOM}\"" bosh-init-working-dir/bosh-manifest.yml

bosh -n create-env bosh-init-working-dir/bosh-manifest.yml \
--state=bosh-init-working-dir/bosh-manifest-state.json
ensure:
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/destroy-bosh-concourse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
ruby-slim: &ruby-slim-image-resource
type: registry-image
source:
Expand All @@ -23,12 +23,12 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7

resource_types:
- name: s3-iam
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/delete-ssh-keys.yml
View file
Open in desktop
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: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
inputs:
- name: paas-bootstrap
run:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/render-bosh-manifest.yml
View file
Open in desktop
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: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
inputs:
- name: bosh-vars-store
optional: true
Expand Down
9 changes: 9 additions & 0 deletions manifests/bosh-manifest/operations.d/031-blobstore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,12 @@

- type: remove
path: /variables/name=blobstore_server_tls

- type: replace
path: /instance_groups/name=bosh/properties/agent/env?/bosh/blobstores?/-
value:
provider: s3
options:
bucket_name: ((bosh_blobstore_bucket_name))
credentials_source: env_or_profile
region: ((region))
11 changes: 8 additions & 3 deletions manifests/bosh-manifest/operations.d/120-cpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
path: /instance_groups/name=bosh/properties/aws/max_retries?
value: 16

# We cache the cpi compile in the bosh-cli-v2 docker image.
# You should update the cpi version here first.
# See: https://github.com/alphagov/paas-docker-cloudfoundry-tools/blob/main/bosh-cli-v2/Dockerfile
# If a different version is used in the image versus the below you will add 3-4 mins to the deploy time.

- path: /releases/name=bosh-aws-cpi
type: replace
value:
name: "bosh-aws-cpi"
version: "97"
url: "https://bosh.io/d/github.com/cloudfoundry/bosh-aws-cpi-release?v=97"
sha1: "b6aa84bc178e5cc99faa55a89943214c33488d5f"
version: "99"
url: "https://bosh.io/d/github.com/cloudfoundry/bosh-aws-cpi-release?v=99"
sha1: "ffc4a06d6728d88eb108418f886f46428c2a1bf2"
1 change: 0 additions & 1 deletion manifests/bosh-manifest/operations.d/130-bosh-UPSTREAM.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions manifests/bosh-manifest/operations.d/600-exporters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
path: /releases/-
value:
name: "node-exporter"
version: "4.2.0"
url: "https://bosh.io/d/github.com/cloudfoundry-community/node-exporter-boshrelease?v=4.2.0"
sha1: "b4ffebacc55fbb9934425ac792bb7179eed7e61c"
version: "5.3.0"
url: "https://bosh.io/d/github.com/cloudfoundry-community/node-exporter-boshrelease?v=5.3.0"
sha1: "4f47c84cb79a543f41fab4412daa930eff12e35b"

- type: replace
path: /instance_groups/name=bosh/jobs/-
Expand Down
2 changes: 1 addition & 1 deletion manifests/bosh-manifest/upstream
Open in desktop
Submodule upstream updated 46 files
+5 −5 alicloud/cpi.yml
+2 −2 alicloud/use-bionic.yml
+5 −0 aws/cli-assume-role-credentials.yml
+8 −0 aws/cpi-assume-role-credentials.yml
+5 −5 aws/cpi.yml
+29 −0 aws/s3-blobstore-instance-profile.yml
+2 −2 aws/use-bionic.yml
+5 −5 azure/cpi.yml
+2 −2 azure/use-bionic.yml
+3 −3 bbr.yml
+3 −3 bosh-lite-docker.yml
+6 −6 bosh-lite.yml
+6 −9 bosh.yml
+1 −1 ci/compiled-releases/tasks/export-release.yml
+29 −7 ci/pipeline.yml
+2 −2 ci/tasks/test-main-bosh-lite.sh
+2 −2 ci/tasks/test-main-bosh-lite.yml
+1 −1 ci/tasks/test-smoke.yml
+1 −1 ci/tasks/update-cpi.yml
+1 −1 ci/tasks/update-release.yml
+1 −1 ci/tasks/update-stemcell.yml
+3 −3 credhub.yml
+7 −6 docker/cpi.yml
+2 −2 docker/use-bionic.yml
+5 −5 gcp/cpi.yml
+2 −2 gcp/use-bionic.yml
+3 −3 jumpbox-user.yml
+3 −3 misc/source-releases/bbr.yml
+6 −6 misc/source-releases/bosh.yml
+3 −3 misc/source-releases/credhub.yml
+3 −3 misc/source-releases/uaa.yml
+5 −5 openstack/cpi.yml
+2 −2 openstack/use-bionic.yml
+2 −2 openstack/use-openstack-raw-stemcell.yml
+3 −3 runtime-configs/dns.yml
+3 −3 syslog.yml
+3 −3 uaa.yml
+2 −2 vcloud/cpi.yml
+2 −2 vcloud/use-bionic.yml
+5 −5 virtualbox/cpi.yml
+2 −2 virtualbox/use-bionic.yml
+3 −3 vsphere/cpi-secondary.yml
+6 −5 vsphere/cpi.yml
+2 −2 vsphere/use-bionic.yml
+5 −5 warden/cpi.yml
+2 −2 warden/use-bionic.yml
8 changes: 4 additions & 4 deletions manifests/runtime-config/runtime-config-base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ releases:
sha1: f2a5fc665b8d6581c302bc90aaa49a7ccd72efb9
properties: {}

- name: node-exporter
version: "4.2.0"
url: "https://bosh.io/d/github.com/cloudfoundry-community/node-exporter-boshrelease?v=4.2.0"
sha1: "b4ffebacc55fbb9934425ac792bb7179eed7e61c"
- name: "node-exporter"
version: "5.3.0"
url: "https://bosh.io/d/github.com/cloudfoundry-community/node-exporter-boshrelease?v=5.3.0"
sha1: "4f47c84cb79a543f41fab4412daa930eff12e35b"