From bf0a9e740d1f984952ce334aab2bc94fdf649bd1 Mon Sep 17 00:00:00 2001 From: Tom Denley Date: Mon, 15 May 2023 16:19:15 +0100 Subject: [PATCH] =?UTF-8?q?na=C3=AFvely=20bump=20from=20bionic=20to=20jamm?= =?UTF-8?q?y,=20as=20the=20former=20is=20end-of-life?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bosh/internal/boshcli/aws.go | 2 +- bosh/internal/boshcli/aws_test.go | 2 +- bosh/internal/boshcli/boshcli.go | 2 +- bosh/internal/boshcli/gcp.go | 2 +- bosh/internal/boshcli/gcp_test.go | 2 +- bosh/internal/fixtures/stemcell_version.json | 2 +- ci/tasks/lib/get-versions.sh | 4 ++-- ci/tasks/write-release-vars.sh | 8 ++++---- concourse/fixtures/director-state.json | 2 +- docs/troubleshooting.md | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bosh/internal/boshcli/aws.go b/bosh/internal/boshcli/aws.go index f75839b90..a118194e9 100644 --- a/bosh/internal/boshcli/aws.go +++ b/bosh/internal/boshcli/aws.go @@ -138,5 +138,5 @@ func (e AWSEnvironment) ConfigureDirectorCloudConfig() (string, error) { } func (e AWSEnvironment) ConcourseStemcellURL() (string, error) { - return concourseStemcellURL(resource.AWSReleaseVersions, "https://storage.googleapis.com/bosh-aws-light-stemcells/%s/light-bosh-stemcell-%s-aws-xen-hvm-ubuntu-bionic-go_agent.tgz") + return concourseStemcellURL(resource.AWSReleaseVersions, "https://storage.googleapis.com/bosh-aws-light-stemcells/%s/light-bosh-stemcell-%s-aws-xen-hvm-ubuntu-jammy-go_agent.tgz") } diff --git a/bosh/internal/boshcli/aws_test.go b/bosh/internal/boshcli/aws_test.go index d329b622e..f1d7454f7 100644 --- a/bosh/internal/boshcli/aws_test.go +++ b/bosh/internal/boshcli/aws_test.go @@ -195,7 +195,7 @@ func TestAWSEnvironment_ConfigureConcourseStemcell(t *testing.T) { }{ { name: "parse versions and provide a valid stemcell url", - want: "https://storage.googleapis.com/bosh-aws-light-stemcells/5/light-bosh-stemcell-5-aws-xen-hvm-ubuntu-bionic-go_agent.tgz", + want: "https://storage.googleapis.com/bosh-aws-light-stemcells/5/light-bosh-stemcell-5-aws-xen-hvm-ubuntu-jammy-go_agent.tgz", wantErr: false, fixture: "stemcell_version", }, diff --git a/bosh/internal/boshcli/boshcli.go b/bosh/internal/boshcli/boshcli.go index 452bc1680..2a237cc2e 100644 --- a/bosh/internal/boshcli/boshcli.go +++ b/bosh/internal/boshcli/boshcli.go @@ -64,7 +64,7 @@ func concourseStemcellURL(releaseVersionsFile, urlFormat string) (string, error) } var version string for _, op := range ops { - if op.Path != "/stemcells/alias=bionic/version" { + if op.Path != "/stemcells/alias=jammy/version" { continue } err := json.Unmarshal(op.Value, &version) diff --git a/bosh/internal/boshcli/gcp.go b/bosh/internal/boshcli/gcp.go index 5aa20e270..64e7cc0d8 100644 --- a/bosh/internal/boshcli/gcp.go +++ b/bosh/internal/boshcli/gcp.go @@ -120,5 +120,5 @@ func (e GCPEnvironment) ConfigureDirectorCloudConfig() (string, error) { } func (e GCPEnvironment) ConcourseStemcellURL() (string, error) { - return concourseStemcellURL(resource.GCPReleaseVersions, "https://storage.googleapis.com/bosh-gce-light-stemcells/%s/light-bosh-stemcell-%s-google-kvm-ubuntu-bionic-go_agent.tgz") + return concourseStemcellURL(resource.GCPReleaseVersions, "https://storage.googleapis.com/bosh-gce-light-stemcells/%s/light-bosh-stemcell-%s-google-kvm-ubuntu-jammy-go_agent.tgz") } diff --git a/bosh/internal/boshcli/gcp_test.go b/bosh/internal/boshcli/gcp_test.go index d7a00d59b..b3e118124 100644 --- a/bosh/internal/boshcli/gcp_test.go +++ b/bosh/internal/boshcli/gcp_test.go @@ -77,7 +77,7 @@ func TestGCPEnvironment_ConfigureConcourseStemcell(t *testing.T) { }{ { name: "parse versions and provide a valid stemcell url", - want: "https://storage.googleapis.com/bosh-gce-light-stemcells/5/light-bosh-stemcell-5-google-kvm-ubuntu-bionic-go_agent.tgz", + want: "https://storage.googleapis.com/bosh-gce-light-stemcells/5/light-bosh-stemcell-5-google-kvm-ubuntu-jammy-go_agent.tgz", wantErr: false, fixture: "stemcell_version", }, diff --git a/bosh/internal/fixtures/stemcell_version.json b/bosh/internal/fixtures/stemcell_version.json index 73a26aee9..2f95ef650 100644 --- a/bosh/internal/fixtures/stemcell_version.json +++ b/bosh/internal/fixtures/stemcell_version.json @@ -1,7 +1,7 @@ [ { "type": "replace", - "path": "/stemcells/alias=bionic/version", + "path": "/stemcells/alias=jammy/version", "value": "5" } ] diff --git a/ci/tasks/lib/get-versions.sh b/ci/tasks/lib/get-versions.sh index 8d12cf5b2..89cd9ece6 100644 --- a/ci/tasks/lib/get-versions.sh +++ b/ci/tasks/lib/get-versions.sh @@ -12,7 +12,7 @@ function getVersions() { grafana_release_version=$( jq -r '.[] | select(.value.name? == "grafana") | .value.version' ops/versions-aws.json) influxdb_release_url=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.url' ops/versions-aws.json) influxdb_release_version=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.version' ops/versions-aws.json) - stemcell_version=$( jq -r '.[] | select(.path == "/stemcells/alias=bionic/version") | .value' ops/versions-aws.json) + stemcell_version=$( jq -r '.[] | select(.path == "/stemcells/alias=jammy/version") | .value' ops/versions-aws.json) uaa_release_url=$( jq -r '.[] | select(.value.name? == "uaa") | .value.url' ops/versions-aws.json) uaa_release_version=$( jq -r '.[] | select(.value.name? == "uaa") | .value.version' ops/versions-aws.json) director_bosh_cpi_release_url=$( jq -r .cpi.url createenv-dependencies-and-cli-versions-aws.json) @@ -33,7 +33,7 @@ function getVersions() { grafana_release_version_gcp=$( jq -r '.[] | select(.value.name? == "grafana") | .value.version' ops/versions-gcp.json) influxdb_release_url_gcp=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.url' ops/versions-gcp.json) influxdb_release_version_gcp=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.version' ops/versions-gcp.json) - stemcell_version_gcp=$( jq -r '.[] | select(.path == "/stemcells/alias=bionic/version") | .value' ops/versions-gcp.json) + stemcell_version_gcp=$( jq -r '.[] | select(.path == "/stemcells/alias=jammy/version") | .value' ops/versions-gcp.json) uaa_release_url_gcp=$( jq -r '.[] | select(.value.name? == "uaa") | .value.url' ops/versions-gcp.json) uaa_release_version_gcp=$( jq -r '.[] | select(.value.name? == "uaa") | .value.version' ops/versions-gcp.json) director_bosh_cpi_release_url_gcp=$( jq -r .cpi.url createenv-dependencies-and-cli-versions-gcp.json) diff --git a/ci/tasks/write-release-vars.sh b/ci/tasks/write-release-vars.sh index 50e9d36d4..ea0c8af4e 100755 --- a/ci/tasks/write-release-vars.sh +++ b/ci/tasks/write-release-vars.sh @@ -48,8 +48,8 @@ Deploys: **AWS** -- Concourse VM stemcell bosh-aws-xen-hvm-ubuntu-bionic-go_agent $stemcell_version -- Director stemcell bosh-aws-xen-hvm-ubuntu-bionic-go_agent $director_stemcell_version +- Concourse VM stemcell bosh-aws-xen-hvm-ubuntu-jammy-go_agent $stemcell_version +- Director stemcell bosh-aws-xen-hvm-ubuntu-jammy-go_agent $director_stemcell_version - Concourse [$concourse_release_version]($concourse_release_url) - BOSH [$director_bosh_release_version]($director_bosh_release_url) - BOSH AWS CPI [$director_bosh_cpi_release_version]($director_bosh_cpi_release_url) @@ -63,8 +63,8 @@ Deploys: **GCP** -- Concourse VM stemcell bosh-google-kvm-ubuntu-bionic-go_agent $stemcell_version_gcp -- Director stemcell bosh-google-kvm-ubuntu-bionic-go_agent $director_stemcell_version_gcp +- Concourse VM stemcell bosh-google-kvm-ubuntu-jammy-go_agent $stemcell_version_gcp +- Director stemcell bosh-google-kvm-ubuntu-jammy-go_agent $director_stemcell_version_gcp - Concourse [$concourse_release_version_gcp]($concourse_release_url_gcp) - BOSH [$director_bosh_release_version_gcp]($director_bosh_release_url_gcp) - BOSH GCP CPI [$director_bosh_cpi_release_version_gcp]($director_bosh_cpi_release_url_gcp) diff --git a/concourse/fixtures/director-state.json b/concourse/fixtures/director-state.json index 476058a31..1993a00e8 100644 --- a/concourse/fixtures/director-state.json +++ b/concourse/fixtures/director-state.json @@ -23,7 +23,7 @@ "stemcells": [ { "id": "b6b63aec-89f6-4ea8-a4fb-cfb70423ff87", - "name": "bosh-aws-xen-hvm-ubuntu-bionic-go_agent", + "name": "bosh-aws-xen-hvm-ubuntu-jammy-go_agent", "version": "170.9", "cid": "ami-0cd3ce643104b027d light" } diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 3a3a6628c..66455bc75 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -28,9 +28,9 @@ Control Tower uses [BOSH](https://bosh.io/docs/) to deploy and manage VMs. When Deployment 'concourse' Instance Process State AZ IPs VM CID VM Type Active Stemcell - web/95589e21-09af-412d-abef-a2065fa828fe running z1 1.2.3.4 i-00000000000000000 concourse-web-xlarge true bosh-aws-xen-hvm-ubuntu-bionic-go_agent/1.67 + web/95589e21-09af-412d-abef-a2065fa828fe running z1 1.2.3.4 i-00000000000000000 concourse-web-xlarge true bosh-aws-xen-hvm-ubuntu-jammy-go_agent/1.67 10.0.0.8 - worker/17cedb77-a924-4e09-bb1a-952b7e8b3fc6 failing z1 10.0.1.7 i-00000000000000000 concourse-2xlarge true bosh-aws-xen-hvm-ubuntu-bionic-go_agent/1.67 + worker/17cedb77-a924-4e09-bb1a-952b7e8b3fc6 failing z1 10.0.1.7 i-00000000000000000 concourse-2xlarge true bosh-aws-xen-hvm-ubuntu-jammy-go_agent/1.67 2 vms