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

Switch pipeline secrets to only use credhub #24

Merged
merged 1 commit into from
May 22, 2024
Merged

Switch pipeline secrets to only use credhub #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,20 @@ There are two ways of enabling service access: via the pipeline and manually:

### Enable via the pipeline (Preferred)

The pipeline uses [https://github.com/cloud-gov/cg-pipeline-tasks/blob/main/set-plan-visibility.yml](https://github.com/cloud-gov/cg-pipeline-tasks/blob/main/set-plan-visibility.yml) to set the list of orgs to enable the broker access. To add additional organizations, modify the `cg-deploy-autoscaler.yml` secrets file, the list of orgs are space delimited:
The pipeline uses [https://github.com/cloud-gov/cg-pipeline-tasks/blob/main/set-plan-visibility.yml](https://github.com/cloud-gov/cg-pipeline-tasks/blob/main/set-plan-visibility.yml) to set the list of orgs to enable the broker access. There are credhub variables for each of the environments which are space delimited. To To add additional organizations, modify the following credhub variables:

```
cf:
development:
service_organization: org1 org2 org3
staging:
service_organization: org1 org2
production:
service_organization: org3 org4 org5
- name: service_organization_development
Copy link
Contributor

@markdboyd markdboyd May 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I assume the full name of the credhub variable is longer, but perhaps not safe to document here in the repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The names of all the credhub variables, along with relative or absolute paths, are already available in all of our manifests and ops files.

Good eye though, that's why I didn't provide the credhub cli command to update it

type: value
value: org1 org2

- name: service_organization_staging
type: value
value: org2 org3

- name: service_organization_production
type: value
value: org1 org2 org3
```

### Manual enabling (Debugging)
Expand Down Expand Up @@ -505,3 +509,4 @@ In no particular order:
- The defaults for data retentions for metrics history, scaling history and others are kept at the defaults defined in the spec, an example of this can be seen [here](https://github.com/cloudfoundry/app-autoscaler-release/blob/main/jobs/operator/spec#L215-L217).
- Policies with recurring or date schedules still require scaling rules with a metric type defined. If you want to force an app to scale at a particular make sure that the scaling rules are easy to achieve (ie: cpu > 0)
- The dynamic_policy_test.go tests for disk will fail with the default 128MB of memory in Staging and Production (oddly works fine in development), this was bumped in the configuration file to 1024 MB for the `app` tests
- All pipeline secrets are stored in credhub, the s3 file is no longer used.
90 changes: 45 additions & 45 deletions ci/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ jobs:
file: pipeline-tasks/set-plan-visibility.yml
params:
CF_API_URL: ((cf.development.api))
CF_USERNAME: ((cf.development.admin_user))
CF_PASSWORD: ((cf.development.admin_password))
CF_USERNAME: ((admin_user_development))
CF_PASSWORD: ((admin_password_development))
CF_ORGANIZATION: ((broker-organization))
CF_SPACE: ((broker-space))
BROKER_NAME: ((broker-name))
SERVICES: ((cf.development.services))
SERVICE_ORGANIZATION: ((cf.development.service_organization))
SERVICE_ORGANIZATION: ((service_organization_development))
on_success:
put: slack
params:
Expand Down Expand Up @@ -96,8 +96,8 @@ jobs:
# params:
# CF_API: ((cf.development.api))
# CF_APPS_DOMAIN: ((cf.development.apps_domain))
# CF_ADMIN_USER: ((cf.development.admin_user))
# CF_ADMIN_PASSWORD: ((cf.development.admin_password))
# CF_ADMIN_USER: ((admin_user_development))
# CF_ADMIN_PASSWORD: ((admin_password_development))
# AUTOSCALER_API: ((cf.development.autoscaler_api))
# COMPONENT_TO_TEST: broker
# AUTOSCALER_CF_ORG: ((cf.development.org))
Expand All @@ -115,8 +115,8 @@ jobs:
# params:
# CF_API: ((cf.development.api))
# CF_APPS_DOMAIN: ((cf.development.apps_domain))
# CF_ADMIN_USER: ((cf.development.admin_user))
# CF_ADMIN_PASSWORD: ((cf.development.admin_password))
# CF_ADMIN_USER: ((admin_user_development))
# CF_ADMIN_PASSWORD: ((admin_password_development))
# AUTOSCALER_API: ((cf.development.autoscaler_api))
# COMPONENT_TO_TEST: api
# AUTOSCALER_CF_ORG: ((cf.development.org))
Expand All @@ -134,8 +134,8 @@ jobs:
# params:
# CF_API: ((cf.development.api))
# CF_APPS_DOMAIN: ((cf.development.apps_domain))
# CF_ADMIN_USER: ((cf.development.admin_user))
# CF_ADMIN_PASSWORD: ((cf.development.admin_password))
# CF_ADMIN_USER: ((admin_user_development))
# CF_ADMIN_PASSWORD: ((admin_password_development))
# AUTOSCALER_API: ((cf.development.autoscaler_api))
# COMPONENT_TO_TEST: app
# AUTOSCALER_CF_ORG: ((cf.development.org))
Expand All @@ -158,8 +158,8 @@ jobs:
params:
CF_API: ((cf.development.api))
CF_APPS_DOMAIN: ((cf.development.apps_domain))
CF_ADMIN_USER: ((cf.development.admin_user))
CF_ADMIN_PASSWORD: ((cf.development.admin_password))
CF_ADMIN_USER: ((admin_user_development))
CF_ADMIN_PASSWORD: ((admin_password_development))
AUTOSCALER_API: ((cf.development.autoscaler_api))
COMPONENT_TO_TEST: broker
AUTOSCALER_CF_ORG: ((cf.development.org))
Expand Down Expand Up @@ -199,8 +199,8 @@ jobs:
params:
CF_API: ((cf.development.api))
CF_APPS_DOMAIN: ((cf.development.apps_domain))
CF_ADMIN_USER: ((cf.development.admin_user))
CF_ADMIN_PASSWORD: ((cf.development.admin_password))
CF_ADMIN_USER: ((admin_user_development))
CF_ADMIN_PASSWORD: ((admin_password_development))
AUTOSCALER_API: ((cf.development.autoscaler_api))
COMPONENT_TO_TEST: api
AUTOSCALER_CF_ORG: ((cf.development.org))
Expand Down Expand Up @@ -240,8 +240,8 @@ jobs:
params:
CF_API: ((cf.development.api))
CF_APPS_DOMAIN: ((cf.development.apps_domain))
CF_ADMIN_USER: ((cf.development.admin_user))
CF_ADMIN_PASSWORD: ((cf.development.admin_password))
CF_ADMIN_USER: ((admin_user_development))
CF_ADMIN_PASSWORD: ((admin_password_development))
AUTOSCALER_API: ((cf.development.autoscaler_api))
COMPONENT_TO_TEST: app
AUTOSCALER_CF_ORG: ((cf.development.org))
Expand Down Expand Up @@ -320,13 +320,13 @@ jobs:
file: pipeline-tasks/set-plan-visibility.yml
params:
CF_API_URL: ((cf.staging.api))
CF_USERNAME: ((cf.staging.admin_user))
CF_PASSWORD: ((cf.staging.admin_password))
CF_USERNAME: ((admin_user_staging))
CF_PASSWORD: ((admin_password_staging))
CF_ORGANIZATION: ((broker-organization))
CF_SPACE: ((broker-space))
BROKER_NAME: ((broker-name))
SERVICES: ((cf.staging.services))
SERVICE_ORGANIZATION: ((cf.staging.service_organization))
SERVICE_ORGANIZATION: ((service_organization_staging))
on_success:
put: slack
params:
Expand Down Expand Up @@ -365,8 +365,8 @@ jobs:
params:
CF_API: ((cf.staging.api))
CF_APPS_DOMAIN: ((cf.staging.apps_domain))
CF_ADMIN_USER: ((cf.staging.admin_user))
CF_ADMIN_PASSWORD: ((cf.staging.admin_password))
CF_ADMIN_USER: ((admin_user_staging))
CF_ADMIN_PASSWORD: ((admin_password_staging))
AUTOSCALER_API: ((cf.staging.autoscaler_api))
COMPONENT_TO_TEST: broker
AUTOSCALER_CF_ORG: ((cf.staging.org))
Expand Down Expand Up @@ -405,8 +405,8 @@ jobs:
params:
CF_API: ((cf.staging.api))
CF_APPS_DOMAIN: ((cf.staging.apps_domain))
CF_ADMIN_USER: ((cf.staging.admin_user))
CF_ADMIN_PASSWORD: ((cf.staging.admin_password))
CF_ADMIN_USER: ((admin_user_staging))
CF_ADMIN_PASSWORD: ((admin_password_staging))
AUTOSCALER_API: ((cf.staging.autoscaler_api))
COMPONENT_TO_TEST: api
AUTOSCALER_CF_ORG: ((cf.staging.org))
Expand Down Expand Up @@ -445,8 +445,8 @@ jobs:
params:
CF_API: ((cf.staging.api))
CF_APPS_DOMAIN: ((cf.staging.apps_domain))
CF_ADMIN_USER: ((cf.staging.admin_user))
CF_ADMIN_PASSWORD: ((cf.staging.admin_password))
CF_ADMIN_USER: ((admin_user_staging))
CF_ADMIN_PASSWORD: ((admin_password_staging))
AUTOSCALER_API: ((cf.staging.autoscaler_api))
COMPONENT_TO_TEST: app
AUTOSCALER_CF_ORG: ((cf.staging.org))
Expand Down Expand Up @@ -524,13 +524,13 @@ jobs:
file: pipeline-tasks/set-plan-visibility.yml
params:
CF_API_URL: ((cf.production.api))
CF_USERNAME: ((cf.production.admin_user))
CF_PASSWORD: ((cf.production.admin_password))
CF_USERNAME: ((admin_user_production))
CF_PASSWORD: ((admin_password_production))
CF_ORGANIZATION: ((broker-organization))
CF_SPACE: ((broker-space))
BROKER_NAME: ((broker-name))
SERVICES: ((cf.production.services))
SERVICE_ORGANIZATION: ((cf.production.service_organization))
SERVICE_ORGANIZATION: ((service_organization_production))
on_success:
put: slack
params:
Expand Down Expand Up @@ -569,8 +569,8 @@ jobs:
params:
CF_API: ((cf.production.api))
CF_APPS_DOMAIN: ((cf.production.apps_domain))
CF_ADMIN_USER: ((cf.production.admin_user))
CF_ADMIN_PASSWORD: ((cf.production.admin_password))
CF_ADMIN_USER: ((admin_user_production))
CF_ADMIN_PASSWORD: ((admin_password_production))
AUTOSCALER_API: ((cf.production.autoscaler_api))
COMPONENT_TO_TEST: broker
AUTOSCALER_CF_ORG: ((cf.production.org))
Expand Down Expand Up @@ -609,8 +609,8 @@ jobs:
params:
CF_API: ((cf.production.api))
CF_APPS_DOMAIN: ((cf.production.apps_domain))
CF_ADMIN_USER: ((cf.production.admin_user))
CF_ADMIN_PASSWORD: ((cf.production.admin_password))
CF_ADMIN_USER: ((admin_user_production))
CF_ADMIN_PASSWORD: ((admin_password_production))
AUTOSCALER_API: ((cf.production.autoscaler_api))
COMPONENT_TO_TEST: api
AUTOSCALER_CF_ORG: ((cf.production.org))
Expand Down Expand Up @@ -649,8 +649,8 @@ jobs:
params:
CF_API: ((cf.production.api))
CF_APPS_DOMAIN: ((cf.production.apps_domain))
CF_ADMIN_USER: ((cf.production.admin_user))
CF_ADMIN_PASSWORD: ((cf.production.admin_password))
CF_ADMIN_USER: ((admin_user_production))
CF_ADMIN_PASSWORD: ((admin_password_production))
AUTOSCALER_API: ((cf.production.autoscaler_api))
COMPONENT_TO_TEST: app
AUTOSCALER_CF_ORG: ((cf.production.org))
Expand Down Expand Up @@ -753,29 +753,29 @@ resources:
- name: autoscaler-deployment-development
type: bosh-deployment
source:
target: ((bosh.development.environment))
client: ((bosh.development.client))
client_secret: ((bosh.development.client-secret))
ca_cert: ((bosh-ca-cert))
target: ((bosh-director-info.development.environment))
client: ((bosh-director-info.development.client))
client_secret: ((bosh-director-info.development.client_secret))
ca_cert: ((bosh-director-info.development.ca_cert))
deployment: app-autoscaler


- name: autoscaler-deployment-staging
type: bosh-deployment
source:
target: ((bosh.staging.environment))
client: ((bosh.staging.client))
client_secret: ((bosh.staging.client-secret))
ca_cert: ((bosh-ca-cert))
target: ((bosh-director-info.staging.environment))
client: ((bosh-director-info.staging.client))
client_secret: ((bosh-director-info.staging.client_secret))
ca_cert: ((bosh-director-info.staging.ca_cert))
deployment: app-autoscaler

- name: autoscaler-deployment-production
type: bosh-deployment
source:
target: ((bosh.production.environment))
client: ((bosh.production.client))
client_secret: ((bosh.production.client-secret))
ca_cert: ((bosh-ca-cert))
target: ((bosh-director-info.production.environment))
client: ((bosh-director-info.production.client))
client_secret: ((bosh-director-info.production.client-secret))
ca_cert: ((bosh-director-info.production.ca_cert))
deployment: app-autoscaler

- name: slack
Expand Down
Loading