Skip to content

Remove temporary_disable_non_tls_endpoints - #716

Merged
WeiQuan0605 merged 2 commits into
developfrom
remove-temporary-disable-non-tls-flag
Nov 20, 2026
Merged

WeiQuan0605 merged 2 commits into
developfrom
remove-temporary-disable-non-tls-flag

Conversation

@WeiQuan0605

Copy link
Copy Markdown
Contributor
  • A short explanation of the proposed change:

    Removes the temporary_disable_non_tls_endpoints flag from capi-release. Deletes the port 9022 (non-TLS HTTP) nginx server blocks in nginx.conf.erb and blobstore.conf.erb. Updates BBR backup/restore scripts to use cc.public_tls.port (HTTPS, no mTLS) instead of cc.external_port. Updates New Relic nginx status polling to use HTTPS.

  • An explanation of the use cases your change solves:

    Port 9022 is no longer needed, all internal callers have migrated to the mTLS endpoint (port 9023). Keeping the flag and the HTTP listener blocks the full removal of non-TLS internal communication. This change completes the cleanup after the cc-ng side removed the /internal/v2/droplets/ route.

  • Links to any other associated PRs

    Remove plain HTTP port 9022 and non-TLS code paths cloud_controller_ng#5588

  • I have viewed signed and have submitted the Contributor License Agreement

  • I have made this pull request to the develop branch

  • I have run CF Acceptance Tests on bosh lite

@WeiQuan0605
WeiQuan0605 force-pushed the remove-temporary-disable-non-tls-flag branch from 1f702c2 to b8a3d4b Compare November 10, 2026 11:07

@jochenehret jochenehret left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For consistency, the PR should also adapt:
https://github.com/cloudfoundry/capi-release/blob/develop/jobs/cloud_controller_ng/templates/nginx_maintenance.conf.erb
This is the nginx configuration that is active during a bbr backup/restore. Here we should also remove port 9022.

-
instance_name: 'CC Nginx (<%= properties.cc.newrelic.environment_name %>)'
status_url: http://localhost:<%= p("cc.external_port") %>/nginx_status
status_url: https://localhost:<%= p("cc.public_tls.port") %>/nginx_status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

According to Claude, the newrelic_plugin gem does not set skip TLS verification. Then this status check will always fail. Have you checked that?

A possible alternative is to use 127.0.0.1:9021, but that would require a small change in the nginx config (expose stub_status on /nginx_status).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I thought curl -k skips TLS, true for BBR scripts.

But if New Relic gem uses its own HTTP client, not curl, http://127.0.0.1:9021 is a better choice.

@WeiQuan0605
WeiQuan0605 merged commit 4303088 into develop Nov 20, 2026
2 checks passed
@moleske
moleske deleted the remove-temporary-disable-non-tls-flag branch November 20, 2026 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants