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.

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

Experimental ops file for disabling CF CredHub #1179

Merged
merged 3 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions ci/pipelines/cf-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,8 @@ jobs:
operations/experimental/colocate-smoke-tests-on-cc-worker.yml
operations/experimental/enable-oci-phase-1.yml
operations/experimental/enable-containerd-for-processes.yml
operations/experimental/disable-cf-credhub.yml
operations/experimental/disable-interpolate-service-bindings.yml
operations/increase-doppler-vm-type-from-minimal-to-small.yml
operations/scale-diego-cell-to-8.yml
operations/test/speed-up-dynamic-asgs.yml
Expand Down Expand Up @@ -1178,6 +1180,8 @@ jobs:
operations/experimental/colocate-smoke-tests-on-cc-worker.yml
operations/experimental/enable-oci-phase-1.yml
operations/experimental/enable-containerd-for-processes.yml
operations/experimental/disable-cf-credhub.yml
operations/experimental/disable-interpolate-service-bindings.yml
operations/experimental/disable-v2-api.yml
operations/experimental/use-mysql-version-8.0.yml
operations/increase-doppler-vm-type-from-minimal-to-small.yml
Expand Down
3 changes: 2 additions & 1 deletion operations/experimental/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ This is the README for Experimental Ops-files. To learn more about `cf-deploymen
| [`add-system-metrics-agent.yml`](add-system-metrics-agent.yml) | **PROMOTED: use `../addons/add-system-metrics-agent.yml`** | | **NO** |
| [`add-system-metrics-agent-windows2019.yml`](add-system-metrics-agent-windows2019.yml) | **PROMOTED: use `../addons/add-system-metrics-agent-windows2019.yml`** | | **NO** |
| [`colocate-smoke-tests-on-cc-worker.yml`](colocate-smoke-tests-on-cc-worker.yml) | Colocate the smoke_tests job on the cc-worker instance | A number of other operations files reference this instance group and may be incompatible with this operations file. Use `find ./operations/ -name "*.yml" | xargs grep "/instance_groups/name=smoke-tests"` to locate said files. | **YES** |
| [`disable-interpolate-service-bindings.yml`](disable-interpolate-service-bindings.yml) | Disables the interpolation of CredHub service credentials by Cloud Controller. | | **NO** |
| [`disable-interpolate-service-bindings.yml`](disable-interpolate-service-bindings.yml) | Disables the interpolation of CredHub service credentials by Cloud Controller. | | **YES** |
| [`disable-cf-credhub.yml`](disable-cf-credhub.yml) | Completely removes the CF CredHub instances, UAA clients, credentials and certificates. Can be used to save cost if you don't use CredHub to store service credentials. | | **YES** |
| [`enable-app-log-rate-limiting.yml`](enable-app-log-rate-limiting.yml) | Enable rate limiting for number of logs generated by the application. | Introduces variable `app_log_rate_limit`. | **NO** |
| [`enable-app-log-rate-limiting-windows2019.yml`](enable-app-log-rate-limiting-windows2019.yml) | Enable rate limiting for number of logs generated by the application. | Introduces variable `app_log_rate_limit`. Requires `../windows2019-cell.yml` | **NO** |
| [`enable-bpm-garden.yml`](enable-bpm-garden.yml) | Enables the [BOSH Process Manager](https://github.com/cloudfoundry-incubator/bpm-release) for Garden. | This ops file **cannot** be deployed in conjunction with `enable-oci-phase-1.yml`. | **NO** |
Expand Down
36 changes: 36 additions & 0 deletions operations/experimental/disable-cf-credhub.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Instance Group
- type: remove
path: /instance_groups/name=credhub

# Release
- type: remove
path: /releases/name=credhub

# UAA clients
- type: remove
path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/clients/cc_service_key_client?
- type: remove
path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/clients/credhub_admin_client
- type: replace
path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/uaa/clients/cc_service_key_client/secret
value: x

# Properties
- type: remove
path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/credhub_api
- type: remove
path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs/1
- type: remove
path: /instance_groups/name=diego-cell/jobs/name=rep/properties/containers/trusted_ca_certificates/1

# Vars
- type: remove
path: /variables/name=credhub_encryption_password
- type: remove
path: /variables/name=credhub_admin_client_secret
- type: remove
path: /variables/name=credhub_ca
- type: remove
path: /variables/name=credhub_tls
- type: remove
path: /variables/name=uaa_clients_cc_service_key_client_secret
1 change: 1 addition & 0 deletions units/tests/experimental_test/operations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ add-system-metrics-agent-windows2019.yml:
- add-system-metrics-agent-windows2019.yml
add-system-metrics-agent.yml: {}
colocate-smoke-tests-on-cc-worker.yml: {}
disable-cf-credhub.yml: {}
disable-interpolate-service-bindings.yml: {}
disable-logs-in-firehose.yml: {}
disable-logs-in-firehose-windows2019.yml:
Expand Down