Skip to content

Remove old property: proxy.enabled - Diego release#1026

Merged
ameowlia merged 4 commits intocloudfoundry:developfrom
kart2bc:TNZ-46997
Sep 25, 2025
Merged

Remove old property: proxy.enabled - Diego release#1026
ameowlia merged 4 commits intocloudfoundry:developfrom
kart2bc:TNZ-46997

Conversation

@kart2bc
Copy link
Copy Markdown
Contributor

@kart2bc kart2bc commented Jul 11, 2025 •
edited
Loading

Summary

Remove old property: proxy.enabled - Diego release

Backward Compatibility

Breaking Change? Yes

removing rep and executor related changes as the property is still valid to support the apps with no route.

Test results:

~/workspace/diego-release |TNZ-46997 ↑·1 ✔| 
$ ./scripts/test-in-docker.bash 
Succeeded
go-1.24.6: Pulling from cloudfoundry/tas-runtime-mysql-8.0
Digest: sha256:143a25c52407804ec1e05e0668fe859ccd99339d5d62a3152bde59fd6478f1f1
Status: Image is up to date for cloudfoundry/tas-runtime-mysql-8.0:go-1.24.6
docker.io/cloudfoundry/tas-runtime-mysql-8.0:go-1.24.6
diego-release-mysql-docker-container
c70958959fb6a808b2902a02c1142810569e486c106f3e06d208d5f682ae2059
go version go1.24.6 linux/amd64
/repo/src/code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2 /
/
/tmp/build-proxy-Agtn /
/
Don't run Bundler as root. Installing your bundle as root will break this
application for all non-root users on this machine.
Fetching gem metadata from https://rubygems.org/...........
Fetching ast 2.4.2
Fetching semi_semantic 1.2.0
Installing semi_semantic 1.2.0
Installing ast 2.4.2
Using bundler 2.4.10
Fetching diff-lcs 1.5.1
Fetching json 2.9.0
Installing diff-lcs 1.5.1
Installing json 2.9.0 with native extensions
Fetching language_server-protocol 3.17.0.3
Installing language_server-protocol 3.17.0.3
Fetching parallel 1.26.3
Installing parallel 1.26.3
Fetching racc 1.8.1
Installing racc 1.8.1 with native extensions
Fetching rainbow 3.1.1
Installing rainbow 3.1.1
Fetching regexp_parser 2.9.3
Installing regexp_parser 2.9.3
Fetching rspec-support 3.13.2
Installing rspec-support 3.13.2
Fetching ruby-progressbar 1.13.0
Installing ruby-progressbar 1.13.0
Fetching unicode-emoji 4.0.4
Installing unicode-emoji 4.0.4
Fetching bosh-template 2.4.0
Installing bosh-template 2.4.0
Fetching parser 3.3.6.0
Installing parser 3.3.6.0
Fetching rspec-core 3.13.2
Installing rspec-core 3.13.2
Fetching rspec-expectations 3.13.3
Installing rspec-expectations 3.13.3
Fetching rspec-mocks 3.13.2
Installing rspec-mocks 3.13.2
Fetching unicode-display_width 3.1.2
Installing unicode-display_width 3.1.2
Fetching rubocop-ast 1.36.2
Installing rubocop-ast 1.36.2
Fetching rspec 3.13.0
Installing rspec 3.13.0
Fetching rubocop 1.69.1
Installing rubocop 1.69.1
Bundle complete! 3 Gemfile dependencies, 22 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.
..........................

Finished in 0.16801 seconds (files took 0.12754 seconds to load)
26 examples, 0 failures

Running ./ci/diego-release/linters/sync-package-specs.bash for-diego-release with-exit-on-error=true
Running ./ci/diego-release/linters/sync-submodule-config.bash for-diego-release with-exit-on-error=true
syncing src/idmapper
syncing src/code.cloudfoundry.org/cacheddownloader
syncing src/code.cloudfoundry.org/rep
syncing src/code.cloudfoundry.org/routing-api
syncing src/code.cloudfoundry.org/vendor
syncing src/garden
syncing src/code.cloudfoundry.org/buildpackapplifecycle
syncing src/guardian
syncing src/grootfs
syncing src/code.cloudfoundry.org/credhub-cli
syncing src/code.cloudfoundry.org/executor
syncing src/code.cloudfoundry.org/routing-info
syncing src/cnbapplifecycle
syncing src/code.cloudfoundry.org/bbs
syncing src/code.cloudfoundry.org/locket
Running ./ci/shared/linters/match-golang-os-package-versions.bash for-diego-release with-exit-on-error=true
Running ./ci/diego-release/linters/check-envoy-versions.bash for-diego-release with-exit-on-error=true
Running ./ci/diego-release/linters/check-for-windows-drift.bash for-diego-release with-exit-on-error=true
Running ./ci/diego-release/linters/check-proto-files.bash for-diego-release with-exit-on-error=true
/tmp/X0Ck-linter-tmp-dir //repo /
--2025-09-22 15:20:28--  https://github.com/protocolbuffers/protobuf/releases/download/v3.10.1/protoc-3.10.1-linux-x86_64.zip
Resolving github.com (github.com)... 140.82.116.3
Connecting to github.com (github.com)|140.82.116.3|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: https://release-assets.githubusercontent.com/github-production-release-asset/23357588/20feda00-fa3e-11e9-8e4c-5992b7e6e7c8?sp=r&sv=2018-11-09&sr=b&spr=https&se=2025-09-22T16%3A08%3A09Z&rscd=attachment%3B+filename%3Dprotoc-3.10.1-linux-x86_64.zip&rsct=application%2Foctet-stream&skoid=96c2d410-5711-43a1-aedd-ab1947aa7ab0&sktid=398a6654-997b-47e9-b12b-9515b896b4de&skt=2025-09-22T15%3A07%3A30Z&ske=2025-09-22T16%3A08%3A09Z&sks=b&skv=2018-11-09&sig=yvRDxv2eIEd3JxaIbaa0v0L9Lj%2FK%2FH6jRBmDeNDE1S0%3D&jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmVsZWFzZS1hc3NldHMuZ2l0aHVidXNlcmNvbnRlbnQuY29tIiwia2V5Ijoia2V5MSIsImV4cCI6MTc1ODU1NDcyOSwibmJmIjoxNzU4NTU0NDI5LCJwYXRoIjoicmVsZWFzZWFzc2V0cHJvZHVjdGlvbi5ibG9iLmNvcmUud2luZG93cy5uZXQifQ.8_AvmSLSPoCpskEpP0ircJqYEzQOV9CZMyxop-bmTG4&response-content-disposition=attachment%3B%20filename%3Dprotoc-3.10.1-linux-x86_64.zip&response-content-type=application%2Foctet-stream [following]
--2025-09-22 15:20:28--  https://release-assets.githubusercontent.com/github-production-release-asset/23357588/20feda00-fa3e-11e9-8e4c-5992b7e6e7c8?sp=r&sv=2018-11-09&sr=b&spr=https&se=2025-09-22T16%3A08%3A09Z&rscd=attachment%3B+filename%3Dprotoc-3.10.1-linux-x86_64.zip&rsct=application%2Foctet-stream&skoid=96c2d410-5711-43a1-aedd-ab1947aa7ab0&sktid=398a6654-997b-47e9-b12b-9515b896b4de&skt=2025-09-22T15%3A07%3A30Z&ske=2025-09-22T16%3A08%3A09Z&sks=b&skv=2018-11-09&sig=yvRDxv2eIEd3JxaIbaa0v0L9Lj%2FK%2FH6jRBmDeNDE1S0%3D&jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmVsZWFzZS1hc3NldHMuZ2l0aHVidXNlcmNvbnRlbnQuY29tIiwia2V5Ijoia2V5MSIsImV4cCI6MTc1ODU1NDcyOSwibmJmIjoxNzU4NTU0NDI5LCJwYXRoIjoicmVsZWFzZWFzc2V0cHJvZHVjdGlvbi5ibG9iLmNvcmUud2luZG93cy5uZXQifQ.8_AvmSLSPoCpskEpP0ircJqYEzQOV9CZMyxop-bmTG4&response-content-disposition=attachment%3B%20filename%3Dprotoc-3.10.1-linux-x86_64.zip&response-content-type=application%2Foctet-stream
Resolving release-assets.githubusercontent.com (release-assets.githubusercontent.com)... 185.199.108.133, 185.199.109.133, 185.199.110.133, ...
Connecting to release-assets.githubusercontent.com (release-assets.githubusercontent.com)|185.199.108.133|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1575480 (1.5M) [application/octet-stream]
Saving to: 'protoc-3.10.1-linux-x86_64.zip'

     0K .......... .......... .......... .......... ..........  3% 17.0M 0s
    50K .......... .......... .......... .......... ..........  6% 37.5M 0s
   100K .......... .......... .......... .......... ..........  9% 35.6M 0s
   150K .......... .......... .......... .......... .......... 12% 44.0M 0s
   200K .......... .......... .......... .......... .......... 16% 34.7M 0s
   250K .......... .......... .......... .......... .......... 19% 90.1M 0s
   300K .......... .......... .......... .......... .......... 22% 79.5M 0s
   350K .......... .......... .......... .......... .......... 25% 28.7M 0s
   400K .......... .......... .......... .......... .......... 29% 40.7M 0s
   450K .......... .......... .......... .......... .......... 32% 63.5M 0s
   500K .......... .......... .......... .......... .......... 35% 39.8M 0s
   550K .......... .......... .......... .......... .......... 38% 60.0M 0s
   600K .......... .......... .......... .......... .......... 42% 31.8M 0s
   650K .......... .......... .......... .......... .......... 45% 78.2M 0s
   700K .......... .......... .......... .......... .......... 48% 29.5M 0s
   750K .......... .......... .......... .......... .......... 51% 24.4M 0s
   800K .......... .......... .......... .......... .......... 55% 69.9M 0s
   850K .......... .......... .......... .......... .......... 58% 25.1M 0s
   900K .......... .......... .......... .......... .......... 61% 48.9M 0s
   950K .......... .......... .......... .......... .......... 64% 53.9M 0s
  1000K .......... .......... .......... .......... .......... 68% 64.7M 0s
  1050K .......... .......... .......... .......... .......... 71% 39.0M 0s
  1100K .......... .......... .......... .......... .......... 74% 40.7M 0s
  1150K .......... .......... .......... .......... .......... 77% 48.5M 0s
  1200K .......... .......... .......... .......... .......... 81% 27.6M 0s
  1250K .......... .......... .......... .......... .......... 84% 98.6M 0s
  1300K .......... .......... .......... .......... .......... 87% 35.0M 0s
  1350K .......... .......... .......... .......... .......... 90% 72.1M 0s
  1400K .......... .......... .......... .......... .......... 94% 27.0M 0s
  1450K .......... .......... .......... .......... .......... 97%  132M 0s
  1500K .......... .......... .......... ........             100%  352M=0.04s

2025-09-22 15:20:28 (41.6 MB/s) - 'protoc-3.10.1-linux-x86_64.zip' saved [1575480/1575480]

Archive:  protoc-3.10.1-linux-x86_64.zip
   creating: protoc/include/
   creating: protoc/include/google/
   creating: protoc/include/google/protobuf/
  inflating: protoc/include/google/protobuf/type.proto  
  inflating: protoc/include/google/protobuf/duration.proto  
  inflating: protoc/include/google/protobuf/empty.proto  
  inflating: protoc/include/google/protobuf/wrappers.proto  
  inflating: protoc/include/google/protobuf/field_mask.proto  
   creating: protoc/include/google/protobuf/compiler/
  inflating: protoc/include/google/protobuf/compiler/plugin.proto  
  inflating: protoc/include/google/protobuf/struct.proto  
  inflating: protoc/include/google/protobuf/any.proto  
  inflating: protoc/include/google/protobuf/descriptor.proto  
  inflating: protoc/include/google/protobuf/source_context.proto  
  inflating: protoc/include/google/protobuf/timestamp.proto  
  inflating: protoc/include/google/protobuf/api.proto  
   creating: protoc/bin/
  inflating: protoc/bin/protoc       
  inflating: protoc/readme.txt       
//repo /
/repo/src/code.cloudfoundry.org/bbs/models /repo/src/code.cloudfoundry.org/bbs/models
/repo/src/code.cloudfoundry.org/bbs/models
/repo/src/code.cloudfoundry.org/locket/models /repo/src/code.cloudfoundry.org/locket/models
/repo/src/code.cloudfoundry.org/locket/models
Running ./ci/diego-release/linters/check-metrics-documentation.bash for-diego-release with-exit-on-error=true
Running ./ci/shared/linters/check-expiring-certs.bash for-diego-release with-exit-on-error=true
Checking for expiring certs...
Sourcing: built-binaries/proxy/run.bash
Sourcing: built-binaries/nats-server/run.bash
Setting env: DB_USER
Setting env: DB_PASSWORD
Verifying: verify_go repo/src/code.cloudfoundry.org/auction
go version go1.24.6 linux/amd64
Verifying: verify_go_version_match_bosh_release repo
Verifying: verify_gofmt repo/src/code.cloudfoundry.org/auction
Verifying: verify_govet repo/src/code.cloudfoundry.org/auction
Verifying: verify_staticcheck repo/src/code.cloudfoundry.org/auction
booting mysql.............connection established to mysql
2025/09/22 15:22:01 maxprocs: Leaving GOMAXPROCS=2: CPU quota undefined
[1758554521] Auctionrunner Suite - 103/103 spec

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla bot commented Jul 14, 2025 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@kart2bc kart2bc marked this pull request as ready for review September 22, 2025 15:24
@kart2bc kart2bc requested a review from a team as a code owner September 22, 2025 15:24
ameowlia
ameowlia requested changes Sep 22, 2025
View reviewed changes
jobs/rep/templates/rep.json.erb Outdated
p("diego.executor.instance_identity_key")
rescue
rescue
raise '"when containers.proxy.enabled is true, diego.executor.instance_identity_ca_cert" and "diego.executor.instance_identity_key" must both be set'
Copy link
Copy Markdown
Member

@ameowlia ameowlia Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this error message since it is always true now. There will probably also be a test that needs updating as well.

jobs/rep_windows/templates/rep.json.erb Outdated
p("diego.executor.instance_identity_key")
rescue
rescue
raise '"when containers.proxy.enabled is true, diego.executor.instance_identity_ca_cert" and "diego.executor.instance_identity_key" must both be set'
Copy link
Copy Markdown
Member

@ameowlia ameowlia Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also update this error message

@kart2bc kart2bc force-pushed the TNZ-46997 branch 2 times, most recently from aa4ed84 to 35c34ae Compare September 23, 2025 21:28
@github-project-automation github-project-automation bot moved this from Inbox to Pending Merge | Prioritized in Application Runtime Platform Working Group Sep 25, 2025
@ameowlia ameowlia merged commit 4aa520d into cloudfoundry:develop Sep 25, 2025
1 check passed
@github-project-automation github-project-automation bot moved this from Pending Merge | Prioritized to Done in Application Runtime Platform Working Group Sep 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ameowlia ameowlia ameowlia approved these changes

Assignees

No one assigned

Labels

None yet

Projects

Application Runtime Platform Working Group
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kart2bc @ameowlia