Skip to content

Commit f8d0592

Browse files
strehlestrehle
authored
Merge branch 'cloudfoundry:main' into jwt-bearer
2 parents f029c1f + 0ab76ce commit f8d0592

20 files changed

+190
-174
lines changed

‎cf-deployment.yml‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: cf
3-
manifest_version: v48.0.0
3+
manifest_version: v48.1.0
44
update:
55
canaries: 1
66
canary_watch_time: 30000-1200000
@@ -849,7 +849,7 @@ instance_groups:
849849
cloud_controller: {as: cloud_controller, shared: true}
850850
properties:
851851
name: cf-deployment
852-
build: v48.0.0 # AUTO-POPULATED; DO NOT EDIT
852+
build: v48.1.0 # AUTO-POPULATED; DO NOT EDIT
853853
version: 48 # AUTO-POPULATED; DO NOT EDIT
854854
router:
855855
route_services_secret: "((router_route_services_secret))"
@@ -2821,97 +2821,97 @@ releases:
28212821
version: 1.1.15
28222822
sha1: 5b3b1bea2b04e6c312b632a95a139e269467da5f
28232823
- name: bpm
2824-
url: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.4.13
2825-
version: 1.4.13
2826-
sha1: 4c92015bc0610bd2e757593b4c643655f7f89fb7
2824+
url: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.4.14
2825+
version: 1.4.14
2826+
sha1: eb1de2f32bbf2fb12a4e82cef0b6f3dbc9dbfef2
28272827
- name: capi
2828-
url: https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.202.0
2829-
version: 1.202.0
2830-
sha1: 5fbd74b87bcd69931a12fffeef5f69602740c003
2828+
url: https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.203.0
2829+
version: 1.203.0
2830+
sha1: 2a1d2af1ca8184786d53ac4a11a920aeb1dc9ca5
28312831
- name: cf-networking
2832-
url: https://bosh.io/d/github.com/cloudfoundry/cf-networking-release?v=3.65.0
2833-
version: 3.65.0
2834-
sha1: 2f72d94083d2bdf4ee387913c782e900aae71d42
2832+
url: https://bosh.io/d/github.com/cloudfoundry/cf-networking-release?v=3.66.0
2833+
version: 3.66.0
2834+
sha1: 704ece95e314019edcb9683d02618528ecb270ed
28352835
- name: cf-smoke-tests
2836-
url: https://bosh.io/d/github.com/cloudfoundry/cf-smoke-tests-release?v=42.0.191
2837-
version: 42.0.191
2838-
sha1: 36ffedc15a9d183867f5f0bb81859f004c7ee69c
2836+
url: https://bosh.io/d/github.com/cloudfoundry/cf-smoke-tests-release?v=42.0.194
2837+
version: 42.0.194
2838+
sha1: f9e642c1c41a0ec22456577e85ae7e3fcbc9659a
28392839
- name: cflinuxfs4
28402840
url: https://bosh.io/d/github.com/cloudfoundry/cflinuxfs4-release?v=1.268.0
28412841
version: 1.268.0
28422842
sha1: d72651ec76a96f6b7c998620f4d8a72ac8808a4d
28432843
- name: credhub
2844-
url: https://bosh.io/d/github.com/pivotal-cf/credhub-release?v=2.12.103
2845-
version: 2.12.103
2846-
sha1: fec882c74b8258fac89675db0d1bb8458c7df3f7
2844+
url: https://bosh.io/d/github.com/pivotal-cf/credhub-release?v=2.12.104
2845+
version: 2.12.104
2846+
sha1: f0b5fdadbaa4220fd8294daba73aad1f43891c77
28472847
- name: diego
2848-
url: https://bosh.io/d/github.com/cloudfoundry/diego-release?v=2.113.0
2849-
version: 2.113.0
2850-
sha1: 6f2c1bc056c3bc35c3af6f8395756ad2bd82ad6f
2848+
url: https://bosh.io/d/github.com/cloudfoundry/diego-release?v=2.114.0
2849+
version: 2.114.0
2850+
sha1: 2ef96e3e3851fff05a3b9f496fedc4d44caea7f9
28512851
- name: dotnet-core-buildpack
2852-
url: https://bosh.io/d/github.com/cloudfoundry/dotnet-core-buildpack-release?v=2.4.36
2853-
version: 2.4.36
2854-
sha1: af82cef9ad0f5bae74c3fa3e12289d619e5c4dc2
2852+
url: https://bosh.io/d/github.com/cloudfoundry/dotnet-core-buildpack-release?v=2.4.37
2853+
version: 2.4.37
2854+
sha1: 42bc76cbbb63c90b4bc314e87c58132ff2773c8e
28552855
- name: garden-runc
28562856
url: https://bosh.io/d/github.com/cloudfoundry/garden-runc-release?v=1.70.0
28572857
version: 1.70.0
28582858
sha1: 9ba797d2e43679b5dd5d05aa0cc67ef2e1b2018b
28592859
- name: go-buildpack
2860-
url: https://bosh.io/d/github.com/cloudfoundry/go-buildpack-release?v=1.10.24
2861-
version: 1.10.24
2862-
sha1: 13b5abe01a6ff4fa3b2c066b273a763bf944d827
2860+
url: https://bosh.io/d/github.com/cloudfoundry/go-buildpack-release?v=1.10.26
2861+
version: 1.10.26
2862+
sha1: fc28cb53dc0d6573f1d587723c913bd1f89b251a
28632863
- name: java-buildpack
2864-
url: https://bosh.io/d/github.com/cloudfoundry/java-buildpack-release?v=4.74.0
2865-
version: 4.74.0
2866-
sha1: cf886240782fbb079e69cbe61e03eb11f241c665
2864+
url: https://bosh.io/d/github.com/cloudfoundry/java-buildpack-release?v=4.75.0
2865+
version: 4.75.0
2866+
sha1: 9597620d59e5d99836f841653e10da8893d9ba6c
28672867
- name: loggregator
28682868
url: https://bosh.io/d/github.com/cloudfoundry/loggregator-release?v=107.0.19
28692869
version: 107.0.19
28702870
sha1: 8d904f3aebee5ac119662c67b84c006c900b33e4
28712871
- name: nats
2872-
url: https://bosh.io/d/github.com/cloudfoundry/nats-release?v=56.38.0
2873-
version: 56.38.0
2874-
sha1: 4ce15761953d88f1184ab0860735796203c3819b
2872+
url: https://bosh.io/d/github.com/cloudfoundry/nats-release?v=56.39.0
2873+
version: 56.39.0
2874+
sha1: a8c78bc28b34eb3d659b84a7442f726d25920196
28752875
- name: nginx-buildpack
2876-
url: https://bosh.io/d/github.com/cloudfoundry/nginx-buildpack-release?v=1.2.20
2877-
version: 1.2.20
2878-
sha1: aa76a5b85a6eb3e82bd0c6019916046d6a41af38
2876+
url: https://bosh.io/d/github.com/cloudfoundry/nginx-buildpack-release?v=1.2.22
2877+
version: 1.2.22
2878+
sha1: 30b3786fd969931ab695eeb154e2ee78b9fc2c32
28792879
- name: r-buildpack
2880-
url: https://bosh.io/d/github.com/cloudfoundry/r-buildpack-release?v=1.2.16
2881-
version: 1.2.16
2882-
sha1: e41ad098fbc00e86fc35c6537202ee9576e6622b
2880+
url: https://bosh.io/d/github.com/cloudfoundry/r-buildpack-release?v=1.2.17
2881+
version: 1.2.17
2882+
sha1: 6c7ed756b2f3e7eaa9397e250a5193ee4b281201
28832883
- name: nodejs-buildpack
2884-
url: https://bosh.io/d/github.com/cloudfoundry/nodejs-buildpack-release?v=1.8.30
2885-
version: 1.8.30
2886-
sha1: 42a5760d889a8ae3561346e773472b09284fa6b8
2884+
url: https://bosh.io/d/github.com/cloudfoundry/nodejs-buildpack-release?v=1.8.34
2885+
version: 1.8.34
2886+
sha1: 207b875a105b36d88cceff61a8dc9b13490bbf2b
28872887
- name: php-buildpack
2888-
url: https://bosh.io/d/github.com/cloudfoundry/php-buildpack-release?v=4.6.25
2889-
version: 4.6.25
2890-
sha1: 93ab5d6189bb531eb0eee8c6d93e951798e7ec7a
2888+
url: https://bosh.io/d/github.com/cloudfoundry/php-buildpack-release?v=4.6.26
2889+
version: 4.6.26
2890+
sha1: 9b08958103d9aeda3e41d5dcb8ea2e5ac206b1a4
28912891
- name: pxc
28922892
url: https://bosh.io/d/github.com/cloudfoundry/pxc-release?v=1.0.37
28932893
version: 1.0.37
28942894
sha1: 62ea835c4fd6cabce728ca8dc148a6fa15579144
28952895
- name: python-buildpack
2896-
url: https://bosh.io/d/github.com/cloudfoundry/python-buildpack-release?v=1.8.30
2897-
version: 1.8.30
2898-
sha1: 8f74d51b05b6efca33ade2b5598c302b012cad85
2896+
url: https://bosh.io/d/github.com/cloudfoundry/python-buildpack-release?v=1.8.32
2897+
version: 1.8.32
2898+
sha1: 784ccdcbc0bdf78d5e8be843e43587eb2a6f04a8
28992899
- name: routing
29002900
url: https://bosh.io/d/github.com/cloudfoundry/routing-release?v=0.330.0
29012901
version: 0.330.0
29022902
sha1: ee4fe1822aa19e4f462799776b96c002339b83ab
29032903
- name: ruby-buildpack
2904-
url: https://bosh.io/d/github.com/cloudfoundry/ruby-buildpack-release?v=1.10.19
2905-
version: 1.10.19
2906-
sha1: 2e32a9e17508bbd60d3c5d4eb3cd3afdb34ebedd
2904+
url: https://bosh.io/d/github.com/cloudfoundry/ruby-buildpack-release?v=1.10.21
2905+
version: 1.10.21
2906+
sha1: b32e5134b65d6dd835b51fcbe0ff15de7a0b93f7
29072907
- name: silk
2908-
url: https://bosh.io/d/github.com/cloudfoundry/silk-release?v=3.65.0
2909-
version: 3.65.0
2910-
sha1: b9150630a5bd3d42b1e892f34a10f865610a737d
2908+
url: https://bosh.io/d/github.com/cloudfoundry/silk-release?v=3.66.0
2909+
version: 3.66.0
2910+
sha1: c12f283c16da8d6d2cc50925f2f2daba2a3180f1
29112911
- name: staticfile-buildpack
2912-
url: https://bosh.io/d/github.com/cloudfoundry/staticfile-buildpack-release?v=1.6.18
2913-
version: 1.6.18
2914-
sha1: 83201f33a9d159dfec259632bc2740daf898f09f
2912+
url: https://bosh.io/d/github.com/cloudfoundry/staticfile-buildpack-release?v=1.6.22
2913+
version: 1.6.22
2914+
sha1: aa0cddee564328bd2c150200f71a1ecb53c5769e
29152915
- name: statsd-injector
29162916
url: https://bosh.io/d/github.com/cloudfoundry/statsd-injector-release?v=1.11.46
29172917
version: 1.11.46

‎ci/pipelines/cf-deployment.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ jobs:
583583
operations/addons/add-system-metrics-agent.yml
584584
operations/use-postgres.yml
585585
operations/experimental/enable-tls-cloud-controller-postgres.yml
586-
operations/experimental/disable-v2-api.yml
587586
operations/change-postgres-max-connections.yml
588587
operations/use-internal-lookup-for-route-services.yml
589588
operations/enable-tls-on-file-server.yml
@@ -863,7 +862,6 @@ jobs:
863862
operations/use-external-dbs.yml
864863
operations/add-external-ips-for-cloud-sql-db.yml
865864
operations/experimental/colocate-smoke-tests-on-cc-worker.yml
866-
operations/experimental/disable-v2-api.yml
867865
operations/set-cpu-weight.yml
868866
operations/enable-cpu-throttling.yml
869867
operations/use-external-blobstore.yml
@@ -919,7 +917,6 @@ jobs:
919917
operations/use-external-dbs.yml
920918
operations/add-external-ips-for-cloud-sql-db.yml
921919
operations/experimental/colocate-smoke-tests-on-cc-worker.yml
922-
operations/experimental/disable-v2-api.yml
923920
operations/set-cpu-weight.yml
924921
operations/enable-cpu-throttling.yml
925922
operations/use-external-blobstore.yml
@@ -1157,7 +1154,6 @@ jobs:
11571154
operations/experimental/enable-containerd-for-processes.yml
11581155
operations/experimental/disable-cf-credhub.yml
11591156
operations/experimental/disable-interpolate-service-bindings.yml
1160-
operations/experimental/disable-v2-api.yml
11611157
operations/increase-doppler-vm-type-from-minimal-to-small.yml
11621158
operations/scale-diego-cell-to-8.yml
11631159
operations/test/speed-up-dynamic-asgs.yml
@@ -1214,7 +1210,6 @@ jobs:
12141210
operations/experimental/enable-containerd-for-processes.yml
12151211
operations/experimental/disable-cf-credhub.yml
12161212
operations/experimental/disable-interpolate-service-bindings.yml
1217-
operations/experimental/disable-v2-api.yml
12181213
operations/experimental/use-mysql-version-8.0.yml
12191214
operations/increase-doppler-vm-type-from-minimal-to-small.yml
12201215
operations/scale-diego-cell-to-8.yml
@@ -1425,7 +1420,6 @@ jobs:
14251420
operations/bosh-lite.yml
14261421
operations/use-internal-lookup-for-route-services.yml
14271422
operations/experimental/colocate-smoke-tests-on-cc-worker.yml
1428-
operations/experimental/disable-v2-api.yml
14291423
REGENERATE_CREDENTIALS: true
14301424
BOSH_LITE: true
14311425
- task: ensure-api-healthy
@@ -1579,7 +1573,6 @@ jobs:
15791573
operations/backup-and-restore/enable-restore-nfs-broker.yml
15801574
operations/enable-smb-volume-service.yml
15811575
operations/backup-and-restore/enable-restore-smb-broker.yml
1582-
operations/experimental/disable-v2-api.yml
15831576
REGENERATE_CREDENTIALS: true
15841577
- in_parallel:
15851578
- task: enable-docker
@@ -1744,7 +1737,6 @@ jobs:
17441737
operations/windows2019-cell.yml
17451738
operations/use-online-windows2019fs.yml
17461739
operations/experimental/use-compiled-releases-windows.yml
1747-
operations/experimental/disable-v2-api.yml
17481740
operations/use-internal-lookup-for-route-services.yml
17491741
operations/experimental/colocate-smoke-tests-on-cc-worker.yml
17501742
operations/addons/add-system-metrics-agent.yml
@@ -1989,7 +1981,6 @@ jobs:
19891981
operations/use-postgres.yml
19901982
operations/stop-skipping-tls-validation.yml
19911983
operations/experimental/enable-tls-cloud-controller-postgres.yml
1992-
operations/experimental/disable-v2-api.yml
19931984
operations/use-latest-stemcell.yml
19941985
VARS_FILES: |
19951986
environments/test/snape/syslog-vars.yml

‎operations/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ This is the README for Ops-files. To learn more about `cf-deployment`, go to the
4545
| [`disable-tls-tcp-routing-isolation-segment-stage-2-route-emitter.yml`](disable-tls-tcp-routing-isolation-segment-stage-2-route-emitter.yml) | Stage 2 deployment for disabling TLS for TCP Routes on isolation segments. See [configuring TCP routes](https://docs.cloudfoundry.org/adminguide/enabling-tcp-routing.html#tls-tcp-routes) for more info. | | **NO ** |
4646
| [`enable-cc-rate-limiting.yml`](enable-cc-rate-limiting.yml) | Enable rate limiting for UAA-authenticated endpoints. | Introduces variables `cc_rate_limiter_general_limit` and `cc_rate_limiter_unauthenticated_limit` | **NO** |
4747
| [`enable-cc-v2-rate-limiting.yml`](enable-cc-rate-limiting.yml) | Enable V2 API rate limiting for UAA-authenticated endpoints. | Introduces variables `cc_v2_rate_limiter_general_limit`, `cc_v2_rate_limiter_admin_limit` and `cc_v2_rate_limiter_reset_interval_in_minutes` | **NO** |
48+
| [`enable-cc-worker-metrics.yml`](enable-cc-worker-metrics.yml) | Enable metrics for cc-workers. | This will setup the metrics endpoint, configure the prom_scraper job and uses mTLS. If you want to use another scraper than prom_scraper you can additionally set `cc.prom_scraper.disabled` to true. | **NO** |
4849
| [`enable-cpu-throttling.yml`](enable-cpu-throttling.yml) | Configure Garden containers with CPU entitlement. | This ops file requires `set-cpu-weight.yml`. | **YES** |
4950
| [`enable-nfs-ldap.yml`](enable-nfs-ldap.yml) | Enables LDAP authentication for NFS volume services | Requires `enable-nfs-volume-service.yml`. Introduces [new variables](example-vars-files/vars-enable-nfs-ldap.yml) | **NO** |
5051
| [`enable-nfs-volume-service.yml`](enable-nfs-volume-service.yml) | Enables volume support and deploys an NFS broker and volume driver | As of cf-deployment v2, you must use the `nfsbrokerpush` errand to cf push the nfs broker after `bosh deploy` completes. | **YES** |

‎operations/backup-and-restore/enable-backup-restore.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
path: /releases/-
33
value:
44
name: backup-and-restore-sdk
5-
sha1: ac03b642cd4e1628bd53901b54ff552f3f01100b
6-
url: https://bosh.io/d/github.com/cloudfoundry-incubator/backup-and-restore-sdk-release?v=1.19.41
7-
version: 1.19.41
5+
sha1: 5d17097bfb0dafddcfcbacec1e0c82f4e2290cd6
6+
url: https://bosh.io/d/github.com/cloudfoundry-incubator/backup-and-restore-sdk-release?v=1.19.43
7+
version: 1.19.43
88
- type: replace
99
path: /instance_groups/-
1010
value:

‎operations/community/use-haproxy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
path: /releases/-
33
value:
44
name: haproxy
5-
sha1: b7e6c8cac51292686eb37469ed58afb5d1a0455e
6-
url: https://bosh.io/d/github.com/cloudfoundry-incubator/haproxy-boshrelease?v=14.6.0%2B2.8.13
7-
version: 14.6.0+2.8.13
5+
sha1: 5d8b1f5e3094f4c20393e1e4f642b45dd9704d7b
6+
url: https://bosh.io/d/github.com/cloudfoundry-incubator/haproxy-boshrelease?v=14.7.0%2B2.8.14
7+
version: 14.7.0+2.8.14
88
- type: replace
99
path: /instance_groups/name=smoke-tests
1010
value:

‎operations/enable-cc-worker-metrics.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
- type: replace
3+
path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/publish_metrics?
4+
value: true
5+
6+
- type: replace
7+
path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/prom_scraper_tls?
8+
value:
9+
ca_cert: ((cc_worker_prom_scraper_scrape_tls.ca))
10+
private_key: ((cc_worker_prom_scraper_scrape_tls.private_key))
11+
public_cert: ((cc_worker_prom_scraper_scrape_tls.certificate))
12+
13+
- type: replace
14+
path: /variables/-
15+
value:
16+
name: cc_worker_prom_scraper_scrape_tls
17+
options:
18+
alternative_names:
19+
- cc_worker_metrics
20+
ca: metric_scraper_ca
21+
common_name: cc_worker_metrics
22+
extended_key_usage:
23+
- client_auth
24+
- server_auth
25+
type: certificate
26+
update_mode: converge

‎operations/enable-nfs-volume-service.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,6 @@
142142
path: /releases/-
143143
value:
144144
name: nfs-volume
145-
sha1: 5a3e2b3220738b1c4a5df6c6caf6d3a774190fa2
146-
url: https://bosh.io/d/github.com/cloudfoundry/nfs-volume-release?v=7.20.0
147-
version: 7.20.0
145+
sha1: 8ac0ea6c29a9151d45c4631dd9943de7854d9b54
146+
url: https://bosh.io/d/github.com/cloudfoundry/nfs-volume-release?v=7.21.0
147+
version: 7.21.0

‎operations/enable-smb-volume-service.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,6 @@
129129
path: /releases/-
130130
value:
131131
name: smb-volume
132-
sha1: 2da9bb95921241cd46a7aabd1809f42e9eaeffc6
133-
url: https://bosh.io/d/github.com/cloudfoundry/smb-volume-release?v=3.19.0
134-
version: 3.19.0
132+
sha1: be05fb5f44be99e8d695e8099888896987e60cb5
133+
url: https://bosh.io/d/github.com/cloudfoundry/smb-volume-release?v=3.20.0
134+
version: 3.20.0

‎operations/experimental/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This is the README for Experimental Ops-files. To learn more about `cf-deploymen
4444
| [`set-cpu-weight-windows2019.yml`](set-cpu-weight-windows2019.yml) | CPU shares for each garden container are proportional to its memory limits. | Requires `../windows2019-cell.yml` and `../use-online-windows2019fs.yml` | **NO** |
4545
| [`use-compiled-releases-windows.yml`](use-compiled-releases-windows.yml) | Reverts to source version of releases required for Windows cells | Intended for use with `use-compiled-releases.yml` and any of `windows*-cell.yml` | **YES** |
4646
| [`use-create-swap-delete-vm-strategy.yml`](use-create-swap-delete-vm-strategy.yml) | Configures the default [`vm_strategy`](https://bosh.io/docs/changing-deployment-vm-strategy/) to be `create-swap-delete`. | Requires BOSH director `v267.7+` | **NO** |
47-
| [`disable-v2-api.yml`](disable-v2-api.yml) | Disable v2 Cloud Controller API endpoints | | **NO** |
47+
| [`disable-v2-api.yml`](disable-v2-api.yml) | ***Deprecated as API v2 is disabled by default. It can be re-enabled by operators using enable-v2-api.yml*** | | **NO** |
4848
| [`disable-logs-in-firehose.yml`](disable-logs-in-firehose.yml) | Logs are not sent to dopplers, only metrics | | **NO** |
4949
| [`disable-logs-in-firehose-windows2019.yml`](disable-logs-in-firehose-windows-2019.yml) | Logs are not sent to dopplers, only metrics | | **NO** |
5050
| [`use-native-garden-runc-runner.yml`](use-native-garden-runc-runner.yml) | Configure Garden to **not** create containers via containerd, using the native runner instead. | | **NO** |

‎operations/experimental/disable-v2-api.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
2-
- type: replace
3-
path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/temporary_enable_v2?
4-
value: false
2+
###
3+
# API v2 is disabled by default. It can be re-enabled by operators using enable-v2-api.yml
4+
###

0 commit comments

Comments
 (0)