Skip to content

Commit

Permalink
Merge branch 'v8' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
h0nIg authored Sep 5, 2024
2 parents cd6a003 + 970ec2e commit e08a2a2
Show file tree
Hide file tree
Showing 28 changed files with 264 additions and 257 deletions.
155 changes: 155 additions & 0 deletions .github/ops-files/add-oidc-provider.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
---
- type: replace
path: /instance_groups/name=uaa/jobs/name=uaa/properties/login/oauth?/providers?
value:
cli-oidc-provider:
type: oidc1.0
discoveryUrl: https://uaa-oidc.service.cf.internal:8443/.well-known/openid-configuration
scopes:
- openid
linkText: My other uaa Oauth Provider
showLinkText: true
addShadowUserOnLogin: true
relyingPartyId: rp_oidc_admin
relyingPartySecret: adminsecret
skipSslValidation: true
storeCustomAttributes: true
passwordGrantEnabled: true
attributeMappings:
given_name: given_name
family_name: family_name
user_name: user_name

- type: replace
path: /instance_groups/name=uaa:after
value:
name: uaa-oidc
instances: 1
azs: [z1, z2, z3]
vm_type: default
stemcell: default
persistent_disk: 500
networks:
- name: default
jobs:
- name: uaa
release: uaa
properties:
encryption:
active_key_label: 'key-1'
encryption_keys:
- label: 'key-1'
passphrase: 'MY-PASSPHRASE'
uaadb:
address: sql-db.service.cf.internal
databases:
- name: uaa_oidc
tag: uaa
db_scheme: mysql
port: 3306
roles:
- name: uaa-oidc
password: "((uaa_oidc_database_password))"
tag: admin
uaa:
url: https://uaa-oidc.service.cf.internal:8443
jwt:
policy:
active_key_id: key-1
keys:
key-1:
signingKey: ((uaa-oidc-key1.private_key))
sslCertificate: ((uaa-oidc_tls.certificate))
sslPrivateKey: ((uaa-oidc_tls.private_key))
ca_certs:
- ((mysql_server_certificate.ca))
clients:
rp_oidc_admin:
authorized-grant-types: authorization_code,client_credentials,refresh_token,user_token,password,urn:ietf:params:oauth:grant-type:saml2-bearer,implicit
redirect-uri: https://uaa.service.cf.internal:8443/login/callback/cli-oidc-provider
scope: openid,uaa.admin,clients.read,clients.write,clients.secret,scim.read,scim.write,clients.admin,uaa.user,doppler.firehose
authorities: uaa.admin,clients.admin
secret: adminsecret
scim:
user:
override: true
users:
- name: admin-oidc
password: "((uaa_oidc_admin_password))"
groups:
- uaa.admin
login:
protocol: https
saml:
activeKeyId: key1
keys:
key1:
key: ((saml_oidc-key1.private_key))
passphrase: ''
certificate: ((saml_oidc-key1.certificate))

- type: replace
path: /addons/name=bosh-dns-aliases/jobs/name=bosh-dns-aliases/properties/aliases/-
value:
domain: uaa-oidc.service.cf.internal
targets:
- query: '*'
instance_group: uaa-oidc
deployment: cf
network: default
domain: bosh

- type: replace
path: /instance_groups/name=database/jobs/name=pxc-mysql/properties/seeded_databases?/-
value:
name: uaa_oidc
username: uaa-oidc
password: "((uaa_oidc_database_password))"

- type: replace
path: /variables?/-
value:
name: uaa_oidc_admin_password
type: password

- type: replace
path: /variables?/-
value:
name: uaa_oidc_database_password
type: password

- type: replace
path: /variables?/-
value:
name: uaa-oidc-key1
type: rsa

- type: replace
path: /variables?/-
value:
name: uaa-oidc_ca
type: certificate
options:
is_ca: true
common_name: uaa-oidc
alternative_names: ["*.uaa-oidc.service.cf.internal"]
extended_key_usage:
- server_auth

- type: replace
path: /variables?/-
value:
name: saml_oidc-key1
type: certificate
options:
ca: uaa-oidc_ca
common_name: saml_oidc

- type: replace
path: /variables?/-
value:
name: uaa-oidc_tls
type: certificate
options:
ca: uaa-oidc_ca
common_name: uaa-oidc.service.cf.internal
11 changes: 11 additions & 0 deletions .github/ops-files/add-uaa-client-credentials.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
- type: replace
path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/clients/potato-face?
value:
access-token-validity: 600
authorized-grant-types: client_credentials
override: true
secret: ((client-secret))
scope: openid,routing.router_groups.write,scim.read,cloud_controller.admin,uaa.user,routing.router_groups.read,cloud_controller.read,password.write,cloud_controller.write,network.admin,doppler.firehose,scim.write,uaa.admin
authorities: openid,routing.router_groups.write,scim.read,cloud_controller.admin,uaa.user,routing.router_groups.read,cloud_controller.read,password.write,cloud_controller.write,network.admin,doppler.firehose,scim.write,uaa.admin

4 changes: 4 additions & 0 deletions .github/ops-files/diego-cell-instances.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- type: replace
path: /instance_groups/name=diego-cell/instances
value: 3
105 changes: 0 additions & 105 deletions .github/ops-files/use-cflinuxfs3.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/ops-files/use-latest-capi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
- type: replace
path: /releases/name=capi/version
value: latest

- type: remove
path: /releases/name=capi/url?

- type: remove
path: /releases/name=capi/sha1?
Loading

0 comments on commit e08a2a2

Please sign in to comment.