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

Jump to bottom

upgrade cf-deployment to latest 42.2.0 #3745

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

upgrade cf-deployment to latest 42.2.0 #3745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ff7103
upgrade cf-deployment
Harsh291104 Aug 16, 2024
b7ddb40
removed metrics-discovery-registrar from ops file as it no longer exi…
Harsh291104 Aug 19, 2024
2dd3682
removed metrics-agent from ops file as it no longer exists in cf-depl…
Harsh291104 Aug 19, 2024
2b0ec6c
Updated dependencies as reported by PR checks and for cf-deploy
Harsh291104 Aug 20, 2024
39a1fac
Updated dependencies as reported by PR checks
Harsh291104 Aug 20, 2024
90db264
removed uaa-customized replace
Harsh291104 Aug 27, 2024
6f9f73d
replacing the uaa-customized references for replace
Harsh291104 Aug 27, 2024
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
4 changes: 2 additions & 2 deletions concourse/pipelines/create-cloudfoundry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,13 +549,13 @@ resources:
type: git
source:
uri: https://github.com/cloudfoundry/cf-acceptance-tests
branch: cf32.7
branch: cf42.2

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

Expand Down
2 changes: 1 addition & 1 deletion concourse/pipelines/monitor-remote.yml
View file
Open in desktop
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.93"
tag_filter: "42.0.154"
submodules:
- "src/smoke_tests"

Expand Down
2 changes: 1 addition & 1 deletion manifests/app-autoscaler/operations.d/020-bosh-set-stemcells.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
value:
- alias: default
os: ubuntu-jammy
version: "1.492"
version: "1.506"
2 changes: 1 addition & 1 deletion manifests/cf-deployment
Open in desktop
Submodule cf-deployment updated 64 files
+0 −12 README.md
+144 −192 cf-deployment.yml
+4 −6 ci/input/inputs.yml
+0 −195 ci/pipelines/acceptance.yml
+319 −15 ci/pipelines/cf-deployment.yml
+0 −17 ci/pipelines/jammy-stemcell.md
+0 −267 ci/pipelines/jammy-stemcell.yml
+523 −989 ci/pipelines/update-releases.yml
+51 −4 ci/template/update-releases.yml
+5 −0 operations/README.md
+76 −1 operations/add-persistent-isolation-segment-diego-cell.yml
+4 −0 operations/add-persistent-isolation-segment-router.yml
+6 −6 operations/addons/add-system-metrics-agent.yml
+3 −3 operations/addons/enable-component-syslog.yml
+4 −4 operations/backup-and-restore/enable-backup-restore.yml
+0 −2 operations/community/README.md
+0 −24 operations/community/use-community-postgres-ha.yml
+0 −95 operations/community/use-community-postgres.yml
+3 −3 operations/community/use-haproxy.yml
+7 −7 operations/enable-nfs-volume-service.yml
+4 −4 operations/enable-smb-volume-service.yml
+5 −4 operations/experimental/README.md
+3 −7 operations/experimental/add-otel-collector-windows.yml
+15 −13 operations/experimental/add-otel-collector.yml
+36 −0 operations/experimental/disable-cf-credhub.yml
+3 −3 operations/experimental/enable-nginx-routing-integrity-windows2019.yml
+23 −5 operations/experimental/example-vars-files/vars-override-otel-collector-exporters.yml
+3 −3 operations/experimental/infrastructure-metrics.yml
+9 −16 operations/experimental/use-compiled-releases-windows.yml
+3 −3 operations/experimental/use-mysql-version-8.0.yml
+2 −0 operations/test/README.md
+3 −3 operations/test/add-datadog-firehose-nozzle.yml
+16 −0 operations/test/add-oidc-provider.yml
+6 −0 operations/test/fips-stemcell.yml
+4 −0 operations/test/set-smoke-test-timeout-scale.yml
+3 −2 operations/use-absolute-cpu-entitlement-persistent-isolation-segment.yml
+5 −0 operations/use-absolute-cpu-entitlement-windows2019.yml
+5 −0 operations/use-absolute-cpu-entitlement.yml
+3 −3 operations/use-cflinuxfs4-compat.yml
+125 −135 operations/use-compiled-releases.yml
+3 −0 operations/use-external-blobstore.yml
+3 −3 operations/use-haproxy.yml
+3 −3 operations/use-metric-store.yml
+7 −1 operations/use-offline-windows2019fs.yml
+9 −3 operations/use-online-windows2019fs.yml
+3 −3 operations/use-postgres.yml
+10 −59 operations/windows2019-cell.yml
+95 −0 scripts/fixtures/unit-test-vars-store.yml
+13 −0 texts/deployment-guide.md
+8 −6 texts/versioning.md
+2 −2 units/go.mod
+2 −2 units/go.sum
+1 −0 units/tests/experimental_test/operations.yml
+2 −2 units/tests/semantic_test/semantic_test.go
+9 −0 units/tests/standard_test/operations.yml
+3 −7 units/tests/test_test/operations.yml
+25 −3 units/vendor/github.com/stretchr/testify/assert/assertion_compare.go
+0 −16 units/vendor/github.com/stretchr/testify/assert/assertion_compare_can_convert.go
+0 −16 units/vendor/github.com/stretchr/testify/assert/assertion_compare_legacy.go
+21 −11 units/vendor/github.com/stretchr/testify/assert/assertion_format.go
+41 −18 units/vendor/github.com/stretchr/testify/assert/assertion_forward.go
+129 −78 units/vendor/github.com/stretchr/testify/assert/assertions.go
+15 −12 units/vendor/github.com/stretchr/testify/assert/http_assertions.go
+2 −2 units/vendor/modules.txt
2 changes: 1 addition & 1 deletion manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
value:
- alias: default
os: ubuntu-jammy
version: "1.445"
version: "1.506"
10 changes: 0 additions & 10 deletions manifests/cf-manifest/operations.d/021-bionic-set-stemcells.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@
value:
- os: ubuntu-jammy

- type: replace
path: /addons/name=metrics-discovery-registrar/include/stemcell
value:
- os: ubuntu-jammy

- type: replace
path: /addons/name=metrics-agent/include/stemcell
value:
- os: ubuntu-jammy

- type: replace
path: /addons/name=bpm/include/stemcell
value:
Expand Down
6 changes: 3 additions & 3 deletions manifests/cf-manifest/operations.d/320-cc-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
path: /releases/name=capi
value:
name: "capi"
version: "1.160.0"
url: "https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.160.0"
sha1: "441762d69c857eaeec7260713ce818698b0d6b21"
version: "1.188.0"
url: "https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.188.0"
sha1: "15ad6fd38ea01747e9b6e42570cb0358890748b4"
26 changes: 0 additions & 26 deletions manifests/cf-manifest/operations.d/330-uaa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
path: /instance_groups/name=uaa/jobs/name=route_registrar/properties/route_registrar/routes/name=uaa/health_check/name
value: cf_uaa_health_check

- type: replace
path: /instance_groups/name=uaa/jobs/name=route_registrar/properties/route_registrar/routes/name=uaa/health_check/script_path
value: /var/vcap/jobs/uaa-customized/bin/health_check

- type: replace
path: /instance_groups/name=uaa/jobs/name=route_registrar/properties/route_registrar/routes/name=uaa/uris
value:
Expand Down Expand Up @@ -352,25 +348,3 @@
path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/clients/cf_smoke_tests/override?
value: true

- type: replace
path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/csp?/script-src?
value:
- "'self'"
# SRI hash of our uaa-customized's `application.min.js`
- "'sha256-0EjrOAFUD7PfcL1fVdExK2Tcc2sR9IOEEu9But6mW7A='"

- type: replace
path: /releases/-
value:
name: uaa-customized
version: 0.1.39
url: https://s3-eu-west-1.amazonaws.com/gds-paas-build-releases/uaa-customized-0.1.39.tgz
sha1: 719493879dd0d4e8ad4b9fb65db10c02ecb99d06

- type: replace
path: /instance_groups/name=uaa/jobs/-
value:
name: uaa-customized
release: uaa-customized
properties:
region: ((paas_region_name))
2 changes: 1 addition & 1 deletion manifests/cf-manifest/spec/manifest/release_versions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def get_manifest_releases
# - attempted login using an unknown/unrelated Google account
#
# these are tricky to automate due to their reliance on SSO and/or email.
tested_uaa_version = "76.20.0"
tested_uaa_version = "77.14.0"
manifest_releases = get_manifest_releases

expect(manifest_releases).to have_key("uaa"), "expected release for uaa to be found in manifest"
Expand Down
2 changes: 1 addition & 1 deletion manifests/cf-manifest/spec/manifest/uaa_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

it "has a certificate for jwt policy signing keys" do
jwt_keys = properties.fetch("uaa").fetch("jwt").fetch("policy").fetch("keys")
expect(jwt_keys.keys.count).to eq(2)
expect(jwt_keys.keys.count).to eq(3)
jwt_active_key_id = properties.fetch("uaa").fetch("jwt").fetch("policy").fetch("active_key_id")
default_key = jwt_keys.fetch(jwt_active_key_id)
expect(default_key.fetch("signingKey")).not_to be_empty
Expand Down
Loading