diff --git a/.versions b/.versions index 646fad53..8f5bb5ce 100644 --- a/.versions +++ b/.versions @@ -1,7 +1,7 @@ -credhub=2.9.1 -bucc=0.11.4 -bbr=1.9.20 -bosh=6.4.9 +credhub=2.9.3 +bucc=0.11.5 +bbr=1.9.26 +bosh=6.4.17 uaa=0.10.0 safe=1.6.1 diff --git a/bin/bucc b/bin/bucc index 537d94b5..414edb8e 100755 --- a/bin/bucc +++ b/bin/bucc @@ -621,7 +621,7 @@ _ssh() { echo $BOSH_ALL_PROXY | sed -e 's$ssh+socks5://\(.*\):\(.*\)?.*=\(.*\)$ProxyCommand ssh -W %h:%p \1 -p \2 -i \3$g' > ${tmp_config} fi local user=$(int --path /instance_groups/name=bosh/jobs/name=user_add/properties/users/0/name) - cmd="ssh -i $(ssh_private_key jumpbox_ssh) -F ${tmp_config} $user@$(ip)" + cmd="ssh -i $(ssh_private_key jumpbox_ssh) -F ${tmp_config} $user@$(ip) -o IdentitiesOnly=yes" if [ $# -eq 0 ]; then ${cmd} -t 'command; sudo su -' diff --git a/ci/version b/ci/version index 29fdaef6..3c001eae 100644 --- a/ci/version +++ b/ci/version @@ -1 +1 @@ -## Version: 0.11.3 +## Version: 0.11.4 diff --git a/ops/3-concourse-release.yml b/ops/3-concourse-release.yml index 67e4f073..8bc178d2 100644 --- a/ops/3-concourse-release.yml +++ b/ops/3-concourse-release.yml @@ -2,6 +2,6 @@ path: /releases/name=concourse? value: name: concourse - version: 7.6.0 - url: https://bosh.io/d/github.com/concourse/concourse-bosh-release?v=7.6.0 - sha1: 96e8dbb7759a8522e55812221d0173a89492a1b8 + version: 7.7.1 + url: https://bosh.io/d/github.com/concourse/concourse-bosh-release?v=7.7.1 + sha1: 1e242ed38f73de72ba1bb48f85ea7fbf7eb634a1 diff --git a/ops/5-bucc-version.yml b/ops/5-bucc-version.yml index 2d7f4b2e..ded7d4d9 100644 --- a/ops/5-bucc-version.yml +++ b/ops/5-bucc-version.yml @@ -4,4 +4,4 @@ value: name: concourse/main/bucc_version type: value - value: 0.11.4 + value: 0.11.5 diff --git a/ops/5-cf-postgres.yml b/ops/5-cf-postgres.yml index 79cab313..d095612d 100644 --- a/ops/5-cf-postgres.yml +++ b/ops/5-cf-postgres.yml @@ -1,5 +1,5 @@ - type: replace - path: /instance_groups/name=bosh/jobs/name=postgres-10 + path: /instance_groups/name=bosh/jobs/name=postgres value: name: postgres release: postgres diff --git a/ops/9-bosh-dns-compiled-release.yml b/ops/9-bosh-dns-compiled-release.yml index 9a2ddd74..204ad916 100644 --- a/ops/9-bosh-dns-compiled-release.yml +++ b/ops/9-bosh-dns-compiled-release.yml @@ -3,5 +3,5 @@ value: name: bosh-dns version: 1.10.0 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/bosh-dns-1.10.0-ubuntu-bionic-1.41-20211209-224938-324972887.tgz - sha1: 181b89649555ff3ee83f6d4017f7ad911c71fff8 + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/bosh-dns-1.10.0-ubuntu-bionic-1.76-20220401-010006-455074787.tgz + sha1: 2141ed48eb0a2352510e1c1a6978a6726c75c95f diff --git a/ops/9-bucc-bbr-compiled-release.yml b/ops/9-bucc-bbr-compiled-release.yml index 44b0f6d1..cf407060 100644 --- a/ops/9-bucc-bbr-compiled-release.yml +++ b/ops/9-bucc-bbr-compiled-release.yml @@ -3,5 +3,5 @@ value: name: bucc-bbr version: 8 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/bucc-bbr-8-ubuntu-bionic-1.41-20211209-222644-959018358.tgz - sha1: e9b33df61468632af5405c095a4ae5f9d3bb432c + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/bucc-bbr-8-ubuntu-bionic-1.76-20220401-004857-36037094.tgz + sha1: e9d30ec0f12f202363e40b416d04f97a957e8a05 diff --git a/ops/9-concourse-compiled-release.yml b/ops/9-concourse-compiled-release.yml index fc21ae77..fc500d78 100644 --- a/ops/9-concourse-compiled-release.yml +++ b/ops/9-concourse-compiled-release.yml @@ -2,6 +2,6 @@ path: /releases/name=concourse? value: name: concourse - version: 7.6.0 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/concourse-7.6.0-ubuntu-bionic-1.41-20211209-220700-417119249.tgz - sha1: d6311c1e8d59f78b39b183a776d0fa89320c89c8 + version: 7.7.1 + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/concourse-7.7.1-ubuntu-bionic-1.76-20220401-003501-226437362.tgz + sha1: 3b8b0b5bccc186df2fc1f0d0b609dacde9033d4b diff --git a/ops/9-credhub-importer-compiled-release.yml b/ops/9-credhub-importer-compiled-release.yml index 31724bad..4ab6851e 100644 --- a/ops/9-credhub-importer-compiled-release.yml +++ b/ops/9-credhub-importer-compiled-release.yml @@ -3,5 +3,5 @@ value: name: credhub-importer version: 1.1.0 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/credhub-importer-1.1.0-ubuntu-bionic-1.41-20211209-221551-35720265.tgz - sha1: 78a3dd230dd678671e759de1c2220b4e6653468b + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/credhub-importer-1.1.0-ubuntu-bionic-1.76-20220401-003900-502208286.tgz + sha1: 0d9f9b7a0c1b2034178272650649a567b4ae8957 diff --git a/ops/9-director-bosh-dns-compiled-release.yml b/ops/9-director-bosh-dns-compiled-release.yml index ff9ebdfc..d269c2a0 100644 --- a/ops/9-director-bosh-dns-compiled-release.yml +++ b/ops/9-director-bosh-dns-compiled-release.yml @@ -3,5 +3,5 @@ value: name: director-bosh-dns version: 0.1.0 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/director-bosh-dns-0.1.0-ubuntu-bionic-1.41-20211209-223911-245434224.tgz - sha1: 449fd30998db44096cba986af84e362818da2b3d + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/director-bosh-dns-0.1.0-ubuntu-bionic-1.76-20220401-005529-729796819.tgz + sha1: 3c4ad920c69bed9d149a4a08a18e8637e7e00f68 diff --git a/ops/9-os-conf-compiled-release.yml b/ops/9-os-conf-compiled-release.yml index 86fbda00..ab9880ae 100644 --- a/ops/9-os-conf-compiled-release.yml +++ b/ops/9-os-conf-compiled-release.yml @@ -3,5 +3,5 @@ value: name: os-conf version: 18 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/os-conf-18-ubuntu-bionic-1.41-20211209-221002-769860486.tgz - sha1: 01682f3118d28769d41bd107858e81568743066a + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/os-conf-18-ubuntu-bionic-1.76-20220401-003710-962108539.tgz + sha1: 5d20a864279ea7f4d2933923380f4732a4c5f8e2 diff --git a/ops/9-postgres-compiled-release.yml b/ops/9-postgres-compiled-release.yml index ccd5a89d..443530e4 100644 --- a/ops/9-postgres-compiled-release.yml +++ b/ops/9-postgres-compiled-release.yml @@ -3,5 +3,5 @@ value: name: postgres version: 43 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/postgres-43-ubuntu-bionic-1.41-20211209-222630-831923704.tgz - sha1: 03b51301b800eb166a874f1173832ff9be548251 + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/postgres-43-ubuntu-bionic-1.76-20220401-004847-700006414.tgz + sha1: 467a9f917d54b4591069e1629c8f9aacca58be70 diff --git a/ops/9-vault-credhub-proxy-compiled-release.yml b/ops/9-vault-credhub-proxy-compiled-release.yml index e517fac6..2d965914 100644 --- a/ops/9-vault-credhub-proxy-compiled-release.yml +++ b/ops/9-vault-credhub-proxy-compiled-release.yml @@ -3,5 +3,5 @@ value: name: vault-credhub-proxy version: 1.1.9 - url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/vault-credhub-proxy-1.1.9-ubuntu-bionic-1.41-20211209-223046-994299909.tgz - sha1: 8017067fd4de87600a2eacdde028e5ddad5992ec + url: https://s3.eu-west-1.amazonaws.com/bucc-compiled-releases/vault-credhub-proxy-1.1.9-ubuntu-bionic-1.76-20220401-005229-902625769.tgz + sha1: 4d12e33bfcdbc763d226664510255bbd700125a1 diff --git a/src/bosh-deployment/README.md b/src/bosh-deployment/README.md index 2bed75da..b47a8613 100644 --- a/src/bosh-deployment/README.md +++ b/src/bosh-deployment/README.md @@ -69,7 +69,6 @@ Other releases such as [UAA](https://github.com/cloudfoundry/uaa-release), [Cred - `misc/config-server.yml`: Deploys config-server (see `credhub.yml`) - `misc/proxy.yml`: Configure HTTP proxy for Director and CPI - `runtime-configs/syslog.yml`: Runtime config to enable syslog forwarding -- `experimental/remove-registry.yml`: Remove the registry for compatible director/CPI/stemcell versions. See [tests/run-checks.sh](tests/run-checks.sh) for example usage of different ops files. diff --git a/src/bosh-deployment/alicloud/cpi.yml b/src/bosh-deployment/alicloud/cpi.yml index 07677677..2bb8f14f 100644 --- a/src/bosh-deployment/alicloud/cpi.yml +++ b/src/bosh-deployment/alicloud/cpi.yml @@ -3,15 +3,15 @@ type: replace value: name: bosh-alicloud-cpi - sha1: 583759e5b63abcafe9aa1fcfc483359b71127593 - url: https://github.com/cloudfoundry-incubator/bosh-alicloud-cpi-release/releases/download/v43.0.0/bosh-alicloud-cpi-release-43.0.0.tgz - version: 43.0.0 + sha1: f01fcd9d5a775755086513692d92630e0a77e8ea + url: https://github.com/cloudfoundry-incubator/bosh-alicloud-cpi-release/releases/download/v45.0.0/bosh-alicloud-cpi-release-45.0.0.tgz + version: 45.0.0 - name: stemcell path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 822e9e5395428018eacbada277575047bec8db6f - url: https://bosh-alicloud-light-stemcells-cn.oss-cn-hangzhou.aliyuncs.com/light-bosh-stemcell-1.41-alicloud-kvm-ubuntu-bionic-go_agent.tgz + sha1: d04466691ee13ee4c4390adfbeeba8916968d198 + url: https://bosh-alicloud-light-stemcells-cn.oss-cn-hangzhou.aliyuncs.com/light-bosh-stemcell-1.76-alicloud-kvm-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: @@ -37,29 +37,6 @@ security_group_ids: - ((security_group_id)) vswitch_id: ((vswitch_id)) -- path: /instance_groups/name=bosh/jobs/- - type: replace - value: - name: registry - release: bosh -- path: /instance_groups/name=bosh/properties/registry? - type: replace - value: - address: ((internal_ip)) - db: - adapter: postgres - database: bosh - host: 127.0.0.1 - password: ((postgres_password)) - user: postgres - host: ((internal_ip)) - http: - password: ((registry_password)) - port: 25777 - user: registry - password: ((registry_password)) - port: 25777 - username: registry - path: /instance_groups/name=bosh/jobs/- type: replace value: @@ -87,18 +64,6 @@ access_key_secret: ((access_key_secret)) availability_zone: ((zone)) region: ((region)) -- path: /cloud_provider/ssh_tunnel? - type: replace - value: - host: ((internal_ip)) - port: 22 - private_key: ((private_key)) - user: vcap -- path: /variables/- - type: replace - value: - name: registry_password - type: password - path: /instance_groups/name=bosh/properties/agent/env/bosh/ntp? type: replace value: diff --git a/src/bosh-deployment/aws/cpi.yml b/src/bosh-deployment/aws/cpi.yml index 356b1538..666c0bf3 100644 --- a/src/bosh-deployment/aws/cpi.yml +++ b/src/bosh-deployment/aws/cpi.yml @@ -3,15 +3,15 @@ type: replace value: name: bosh-aws-cpi - sha1: c8fdf45dd3baa0c85f5f64b472b55b2ff3432cb4 - url: https://bosh.io/d/github.com/cloudfoundry/bosh-aws-cpi-release?v=91 - version: 91 + sha1: 1b4d0f542faa1b8e6fd5aaae375073ecf7833291 + url: https://bosh.io/d/github.com/cloudfoundry/bosh-aws-cpi-release?v=93 + version: 93 - name: stemcell path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: cacf5a4e0e7431b94999487ecf94ce01a1c3e49e - url: https://storage.googleapis.com/bosh-aws-light-stemcells/1.41/light-bosh-stemcell-1.41-aws-xen-hvm-ubuntu-bionic-go_agent.tgz + sha1: 24db899386d06ef7ff6818bbccc8fcdd591e683f + url: https://storage.googleapis.com/bosh-aws-light-stemcells/1.76/light-bosh-stemcell-1.76-aws-xen-hvm-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: @@ -28,29 +28,6 @@ type: replace value: subnet: ((subnet_id)) -- path: /instance_groups/name=bosh/jobs/- - type: replace - value: - name: registry - release: bosh -- path: /instance_groups/name=bosh/properties/registry? - type: replace - value: - address: ((internal_ip)) - db: - adapter: postgres - database: bosh - host: 127.0.0.1 - password: ((postgres_password)) - user: postgres - host: ((internal_ip)) - http: - password: ((registry_password)) - port: 25777 - user: registry - password: ((registry_password)) - port: 25777 - username: registry - path: /instance_groups/name=bosh/jobs/- type: replace value: @@ -72,13 +49,6 @@ default_security_groups: ((default_security_groups)) region: ((region)) secret_access_key: ((secret_access_key)) -- path: /cloud_provider/ssh_tunnel? - type: replace - value: - host: ((internal_ip)) - port: 22 - private_key: ((private_key)) - user: vcap - path: /cloud_provider/properties/aws? type: replace value: @@ -87,8 +57,3 @@ default_security_groups: ((default_security_groups)) region: ((region)) secret_access_key: ((secret_access_key)) -- path: /variables/- - type: replace - value: - name: registry_password - type: password diff --git a/src/bosh-deployment/azure/cpi.yml b/src/bosh-deployment/azure/cpi.yml index 2281eeb2..290eaa12 100644 --- a/src/bosh-deployment/azure/cpi.yml +++ b/src/bosh-deployment/azure/cpi.yml @@ -3,15 +3,15 @@ type: replace value: name: bosh-azure-cpi - sha1: d0546e6a516ee1cff077b44f3db12386a8a2f439 - url: https://bosh.io/d/github.com/cloudfoundry/bosh-azure-cpi-release?v=37.6.0 - version: 37.6.0 + sha1: dce9cbc36b19ede2270ad37d73ad5ad434e86f9f + url: https://bosh.io/d/github.com/cloudfoundry/bosh-azure-cpi-release?v=39.0.0 + version: 39.0.0 - name: stemcell path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: de94db9dfb8d6f145751961646a4c31f9e8ce5ad - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-azure-hyperv-ubuntu-bionic-go_agent.tgz + sha1: 5931ff22c76519fb4570cabf75237952219fe79a + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-azure-hyperv-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: @@ -21,29 +21,6 @@ value: subnet_name: ((subnet_name)) virtual_network_name: ((vnet_name)) -- path: /instance_groups/name=bosh/jobs/- - type: replace - value: - name: registry - release: bosh -- path: /instance_groups/name=bosh/properties/registry? - type: replace - value: - address: ((internal_ip)) - db: - adapter: postgres - database: bosh - host: 127.0.0.1 - password: ((postgres_password)) - user: postgres - host: ((internal_ip)) - http: - password: ((registry_password)) - port: 25777 - user: registry - password: ((registry_password)) - port: 25777 - username: registry - path: /instance_groups/name=bosh/jobs/- type: replace value: @@ -70,13 +47,6 @@ storage_account_name: ((storage_account_name)) subscription_id: ((subscription_id)) tenant_id: ((tenant_id)) -- path: /cloud_provider/ssh_tunnel? - type: replace - value: - host: ((internal_ip)) - port: 22 - private_key: ((ssh.private_key)) - user: vcap - path: /cloud_provider/properties/azure? type: replace value: @@ -95,8 +65,3 @@ value: name: ssh type: ssh -- path: /variables/- - type: replace - value: - name: registry_password - type: password diff --git a/src/bosh-deployment/bbr.yml b/src/bosh-deployment/bbr.yml index d4b7806e..54b75488 100644 --- a/src/bosh-deployment/bbr.yml +++ b/src/bosh-deployment/bbr.yml @@ -3,9 +3,9 @@ type: replace value: name: backup-and-restore-sdk - sha1: e9e7ae1011f6869b1408caae045c6df155f5d9ce - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/backup-and-restore-sdk-1.18.29-ubuntu-bionic-1.41-20211209-105034-625862606-20211209105039.tgz - version: 1.18.29 + sha1: ce9e9ebe4385db1ffba8fd176cee06de7494d3fd + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/backup-and-restore-sdk-1.18.36-ubuntu-bionic-1.76-20220401-015520-544241382-20220401015525.tgz + version: 1.18.36 - path: /instance_groups/name=bosh/jobs/- type: replace value: diff --git a/src/bosh-deployment/bosh-lite-docker.yml b/src/bosh-deployment/bosh-lite-docker.yml index e66385a4..512583b1 100644 --- a/src/bosh-deployment/bosh-lite-docker.yml +++ b/src/bosh-deployment/bosh-lite-docker.yml @@ -3,8 +3,8 @@ type: replace value: name: bosh-docker-cpi - sha1: b504a18d1466665db13ddd27ad5315e02ef36013 - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-docker-cpi-0.0.5-ubuntu-bionic-1.41-20211209-104513-623006152-20211209104516.tgz + sha1: 3fb042eae851f306438ab4dc647c396aac21cdd0 + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-docker-cpi-0.0.5-ubuntu-bionic-1.76-20220331-092027-824865838-20220331092030.tgz version: 0.0.5 - path: /releases/- type: replace diff --git a/src/bosh-deployment/bosh-lite.yml b/src/bosh-deployment/bosh-lite.yml index 7f6376f0..af19c7d2 100644 --- a/src/bosh-deployment/bosh-lite.yml +++ b/src/bosh-deployment/bosh-lite.yml @@ -3,16 +3,16 @@ type: replace value: name: garden-runc - sha1: be05c1867e6c469a79528012bf3ba64a7265e0d4 - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/garden-runc-1.19.31-ubuntu-bionic-1.41-20211209-104955-597114795-20211209104958.tgz - version: 1.19.31 + sha1: 887d157e7085b1a549f73b0f118626c73cea622e + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/garden-runc-1.20.3-ubuntu-bionic-1.76-20220331-092550-703095654-20220331092554.tgz + version: 1.20.3 - path: /releases/- release: bosh-warden-cpi type: replace value: name: bosh-warden-cpi - sha1: dc177865df7cec5f38a016c6ced44590f4d69fdd - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-warden-cpi-43-ubuntu-bionic-1.41-20211209-104412-94149099-20211209104414.tgz + sha1: 3fbb5a2f63488e1532155b6cb5657992b69dea6e + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-warden-cpi-43-ubuntu-bionic-1.76-20220331-092010-269430804-20220331092011.tgz version: 43 - path: /instance_groups/name=bosh/jobs/- type: replace diff --git a/src/bosh-deployment/bosh.yml b/src/bosh-deployment/bosh.yml index f602f80b..069eea1c 100644 --- a/src/bosh-deployment/bosh.yml +++ b/src/bosh-deployment/bosh.yml @@ -17,7 +17,7 @@ instance_groups: release: bpm - name: nats release: bosh - - name: postgres-10 + - name: postgres release: bosh - name: blobstore release: bosh @@ -142,13 +142,13 @@ networks: type: manual releases: - name: bosh - sha1: 1eeb5067d342909b68cf5a38783a3421c2f53f55 - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-271.17.0-ubuntu-bionic-1.41-20211209-104853-348622355-20211209104855.tgz - version: 271.17.0 + sha1: 30269892812b46c56a412ce993e4232e47bee4aa + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-272.2.0-ubuntu-bionic-1.76-20220331-092504-144015278-20220331092505.tgz + version: 272.2.0 - name: bpm - sha1: 9e8f0c84773523139e4bf02ec80fea872b04f9aa - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bpm-1.1.15-ubuntu-bionic-1.41-20211209-104652-483576868-20211209104654.tgz - version: 1.1.15 + sha1: f9a6ffc96ba1c712a3c523b8343629b9659b5889 + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bpm-1.1.16-ubuntu-bionic-1.76-20220331-092117-444849847-20220331092119.tgz + version: 1.1.16 resource_pools: - env: bosh: diff --git a/src/bosh-deployment/cloudstack/cpi.yml b/src/bosh-deployment/cloudstack/cpi.yml index ee92db47..6d5357e3 100644 --- a/src/bosh-deployment/cloudstack/cpi.yml +++ b/src/bosh-deployment/cloudstack/cpi.yml @@ -67,31 +67,6 @@ default_key_name: ((cloudstack_default_key_name)) default_zone: ((cloudstack_zone)) -- type: replace - path: /instance_groups/name=bosh/jobs/- - value: - name: registry - release: bosh - -- path: /instance_groups/name=bosh/properties/registry? - type: replace - value: - address: ((internal_ip)) - db: - adapter: postgres - database: bosh - host: 127.0.0.1 - password: ((postgres_password)) - user: postgres - host: ((internal_ip)) - http: - user: registry - password: ((registry_password)) - port: 25777 - username: registry - password: ((registry_password)) - port: 25777 - - type: replace path: /instance_groups/name=bosh/properties/agent/blobstore? value: @@ -111,20 +86,6 @@ options: blobstore_path: /var/vcap/micro_bosh/data/cache -- path: /cloud_provider/ssh_tunnel? - type: replace - value: - host: ((internal_ip)) - port: 22 - private_key: ((private_key)) - user: vcap - - path: /cloud_provider/properties/cloudstack? type: replace value: *cloudstack - -- path: /variables/- - type: replace - value: - name: registry_password - type: password diff --git a/src/bosh-deployment/credhub.yml b/src/bosh-deployment/credhub.yml index 60f539ae..be55c9ff 100644 --- a/src/bosh-deployment/credhub.yml +++ b/src/bosh-deployment/credhub.yml @@ -3,9 +3,9 @@ type: replace value: name: credhub - sha1: 5d0ff2e54abee6380013e09e5d796e42a5add0a3 - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/credhub-2.11.0-ubuntu-bionic-1.41-20211215-181021-327151235-20211215181022.tgz - version: 2.11.0 + sha1: b7aa2b330627428438d1c4ef878ee7b6c44c7bef + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/credhub-2.12.3-ubuntu-bionic-1.76-20220405-163721-003521201-20220405163722.tgz + version: 2.12.3 - path: /instance_groups/name=bosh/jobs/- type: replace value: diff --git a/src/bosh-deployment/docker/cpi.yml b/src/bosh-deployment/docker/cpi.yml index f1fda3bb..e39acf9a 100644 --- a/src/bosh-deployment/docker/cpi.yml +++ b/src/bosh-deployment/docker/cpi.yml @@ -2,15 +2,15 @@ type: replace value: name: bosh-docker-cpi - sha1: 075bc0264d2548173da55a40127757ae962a25b1 - url: https://bosh.io/d/github.com/cppforlife/bosh-docker-cpi-release?v=0.0.5 + sha1: 9052069d3aeabf5c3db36da88789dd89ce5e14cb + url: https://bosh.io/d/github.com/cloudfoundry/bosh-docker-cpi-release?v=0.0.6 version: 0.0.5 - name: stemcell path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 5ee4781aea5d58eeb98425e38d95e931756a9f50 - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-warden-boshlite-ubuntu-bionic-go_agent.tgz + sha1: bf999f542c313eee25c519c906781a1737021162 + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-warden-boshlite-ubuntu-bionic-go_agent.tgz - path: /networks/name=default/subnets/0/cloud_properties? type: replace value: diff --git a/src/bosh-deployment/experimental/postgres-10.yml b/src/bosh-deployment/experimental/postgres-10.yml index cac6c95d..6ecf0583 100644 --- a/src/bosh-deployment/experimental/postgres-10.yml +++ b/src/bosh-deployment/experimental/postgres-10.yml @@ -1,3 +1,6 @@ -# Using this file will upgrade postgres to v10. Once this file is used, downgrading back to older versions is not allowed. - -# Postgres 10 is now default. +--- +- type: replace + path: /instance_groups/name=bosh/jobs/name=postgres? + value: + name: postgres-10 + release: bosh diff --git a/src/bosh-deployment/experimental/postgres-9-4.yml b/src/bosh-deployment/experimental/postgres-9-4.yml index 59c92aa3..a3b80725 100644 --- a/src/bosh-deployment/experimental/postgres-9-4.yml +++ b/src/bosh-deployment/experimental/postgres-9-4.yml @@ -1,6 +1,6 @@ --- - type: replace - path: /instance_groups/name=bosh/jobs/name=postgres-10? + path: /instance_groups/name=bosh/jobs/name=postgres? value: name: postgres-9.4 release: bosh diff --git a/src/bosh-deployment/experimental/remove-registry.yml b/src/bosh-deployment/experimental/remove-registry.yml deleted file mode 100644 index 52955934..00000000 --- a/src/bosh-deployment/experimental/remove-registry.yml +++ /dev/null @@ -1,13 +0,0 @@ -# The registry can safely be omitted if the following versions are satisfied: -# -# v268.3.0+ of the director -# v170.6+ of the Xenial stemcells -# v5.4.0+ of the BOSH CLI - ---- -- type: remove - path: /instance_groups/name=bosh/jobs/name=registry? -- type: remove - path: /instance_groups/name=bosh/properties/registry? -- type: remove - path: /variables/name=registry_password? diff --git a/src/bosh-deployment/external-ip-with-registry-not-recommended.yml b/src/bosh-deployment/external-ip-with-registry-not-recommended.yml index 13431cd8..5971a17a 100644 --- a/src/bosh-deployment/external-ip-with-registry-not-recommended.yml +++ b/src/bosh-deployment/external-ip-with-registry-not-recommended.yml @@ -25,10 +25,6 @@ path: /cloud_provider/mbus value: https://mbus:((mbus_bootstrap_password))@((external_ip)):6868 -- type: replace - path: /cloud_provider/ssh_tunnel/host - value: ((external_ip)) - - type: replace path: /variables/name=mbus_bootstrap_ssl/options/alternative_names/- value: ((external_ip)) diff --git a/src/bosh-deployment/gcp/cpi.yml b/src/bosh-deployment/gcp/cpi.yml index 3a95b8fc..f137beef 100644 --- a/src/bosh-deployment/gcp/cpi.yml +++ b/src/bosh-deployment/gcp/cpi.yml @@ -3,15 +3,15 @@ type: replace value: name: bosh-google-cpi - sha1: 4198ead2e5681c8f2f7fb9ad54fcd6af3a424fc1 - url: https://bosh.io/d/github.com/cloudfoundry/bosh-google-cpi-release?v=41.0.0 - version: 41.0.0 + sha1: 7182bf05687b040e710e96cefa48801481cf722f + url: https://bosh.io/d/github.com/cloudfoundry/bosh-google-cpi-release?v=42.0.0 + version: 42.0.0 - name: stemcell path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 4193e5983f1437b5dbef8896b47cc9cc75ba5845 - url: https://storage.googleapis.com/bosh-gce-light-stemcells/1.41/light-bosh-stemcell-1.41-google-kvm-ubuntu-bionic-go_agent.tgz + sha1: 7da908cf47661236e5935dbafc7cffc3a2a4d185 + url: https://storage.googleapis.com/bosh-gce-light-stemcells/1.76/light-bosh-stemcell-1.76-google-kvm-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: diff --git a/src/bosh-deployment/misc/cpi-secondary-registry.yml b/src/bosh-deployment/misc/cpi-secondary-registry.yml deleted file mode 100644 index 47ee0ea9..00000000 --- a/src/bosh-deployment/misc/cpi-secondary-registry.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Enable registry job -- type: replace - path: /instance_groups/name=bosh/jobs/name=registry? - value: - name: registry - release: bosh - -- type: replace - path: /instance_groups/name=bosh/properties/registry? - value: - address: ((internal_ip)) - host: ((internal_ip)) - db: # todo remove - host: 127.0.0.1 - user: postgres - password: ((postgres_password)) - database: bosh - adapter: postgres - http: - user: registry - password: ((registry_password)) - port: 25777 - username: registry - password: ((registry_password)) - port: 25777 - -- type: replace - path: /variables/name=registry_password? - value: - name: registry_password - type: password diff --git a/src/bosh-deployment/misc/external-db.yml b/src/bosh-deployment/misc/external-db.yml index f9951538..db72e4a7 100644 --- a/src/bosh-deployment/misc/external-db.yml +++ b/src/bosh-deployment/misc/external-db.yml @@ -4,6 +4,9 @@ - type: remove path: /instance_groups/name=bosh/jobs/name=postgres-9.4? +- type: remove + path: /instance_groups/name=bosh/jobs/name=postgres? + - type: remove path: /instance_groups/name=bosh/properties/postgres diff --git a/src/bosh-deployment/misc/source-releases/bbr.yml b/src/bosh-deployment/misc/source-releases/bbr.yml index 94cba4ba..cdcd7d79 100644 --- a/src/bosh-deployment/misc/source-releases/bbr.yml +++ b/src/bosh-deployment/misc/source-releases/bbr.yml @@ -3,6 +3,6 @@ type: replace value: name: backup-and-restore-sdk - sha1: b89a2823047205fd0113b6c90c6051ab59e56124 - url: https://bosh.io/d/github.com/cloudfoundry-incubator/backup-and-restore-sdk-release?v=1.18.29 - version: 1.18.29 + sha1: 7af40256f493476bce1463654bf655d2214b0d53 + url: https://bosh.io/d/github.com/cloudfoundry-incubator/backup-and-restore-sdk-release?v=1.18.36 + version: 1.18.36 diff --git a/src/bosh-deployment/misc/source-releases/bosh.yml b/src/bosh-deployment/misc/source-releases/bosh.yml index 8701c0d0..00c5006a 100644 --- a/src/bosh-deployment/misc/source-releases/bosh.yml +++ b/src/bosh-deployment/misc/source-releases/bosh.yml @@ -3,14 +3,14 @@ type: replace value: name: bosh - sha1: 23538b325d597f5d2f79fd367fb23642af931d87 - url: https://bosh.io/d/github.com/cloudfoundry/bosh?v=271.17.0 - version: 271.17.0 + sha1: 2bac32b40b413a377460bf8a5fd9d50da624f1a4 + url: https://bosh.io/d/github.com/cloudfoundry/bosh?v=272.2.0 + version: 272.2.0 - path: /releases/name=bpm? release: bpm type: replace value: name: bpm - sha1: 0d48aa01a65b947b97570234eb2401e821a8bd35 - url: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.1.15 - version: 1.1.15 + sha1: 492f181f4efa08c5f0b45d22cbe54f0a20edf99e + url: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.1.16 + version: 1.1.16 diff --git a/src/bosh-deployment/misc/source-releases/credhub.yml b/src/bosh-deployment/misc/source-releases/credhub.yml index 2ac400f4..a91d445d 100644 --- a/src/bosh-deployment/misc/source-releases/credhub.yml +++ b/src/bosh-deployment/misc/source-releases/credhub.yml @@ -3,6 +3,6 @@ type: replace value: name: credhub - sha1: 5ee5ca91b37afffa33dde0dcb34fcb6b284095f6 - url: https://bosh.io/d/github.com/pivotal-cf/credhub-release?v=2.11.0 - version: 2.11.0 + sha1: 7ed0c257ac189836096651d50813b0dad8c16092 + url: https://bosh.io/d/github.com/pivotal-cf/credhub-release?v=2.12.3 + version: 2.12.3 diff --git a/src/bosh-deployment/misc/source-releases/uaa.yml b/src/bosh-deployment/misc/source-releases/uaa.yml index d0c26f52..a7c0b3e4 100644 --- a/src/bosh-deployment/misc/source-releases/uaa.yml +++ b/src/bosh-deployment/misc/source-releases/uaa.yml @@ -3,6 +3,6 @@ type: replace value: name: uaa - sha1: 246eb67541ec9addfca32c64a8320de603e48487 - url: https://bosh.io/d/github.com/cloudfoundry/uaa-release?v=75.12.0 - version: 75.12.0 + sha1: 5f9c63ecf952e94ff3ce229eed25069c7ce2a6b0 + url: https://bosh.io/d/github.com/cloudfoundry/uaa-release?v=75.18.0 + version: 75.18.0 diff --git a/src/bosh-deployment/openstack/cpi.yml b/src/bosh-deployment/openstack/cpi.yml index 01ea2ec3..eef5e9bd 100644 --- a/src/bosh-deployment/openstack/cpi.yml +++ b/src/bosh-deployment/openstack/cpi.yml @@ -10,8 +10,8 @@ path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 594a761651c440b945576c37def287c3476cef25 - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-openstack-kvm-ubuntu-bionic-go_agent.tgz + sha1: 454600bab1a7135b029eb2e6fe58634b3211c0d8 + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-openstack-kvm-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: @@ -21,26 +21,6 @@ type: replace value: net_id: ((net_id)) -- path: /instance_groups/name=bosh/jobs/- - type: replace - value: - name: registry - release: bosh -- path: /instance_groups/name=bosh/properties/registry? - type: replace - value: - address: ((internal_ip)) - db: - adapter: postgres - database: bosh - host: 127.0.0.1 - password: ((postgres_password)) - user: postgres - endpoint: http://registry:((registry_password))@((internal_ip)):25777 - host: ((internal_ip)) - password: ((registry_password)) - port: 25777 - username: registry - path: /instance_groups/name=bosh/jobs/- type: replace value: @@ -66,13 +46,6 @@ project: ((openstack_project)) region: ((region)) username: ((openstack_username)) -- path: /cloud_provider/ssh_tunnel? - type: replace - value: - host: ((internal_ip)) - port: 22 - private_key: ((private_key)) - user: vcap - path: /cloud_provider/properties/openstack? type: replace value: @@ -85,8 +58,3 @@ project: ((openstack_project)) region: ((region)) username: ((openstack_username)) -- path: /variables/- - type: replace - value: - name: registry_password - type: password diff --git a/src/bosh-deployment/openstack/use-openstack-raw-stemcell.yml b/src/bosh-deployment/openstack/use-openstack-raw-stemcell.yml index f3de07f1..2fba1633 100644 --- a/src/bosh-deployment/openstack/use-openstack-raw-stemcell.yml +++ b/src/bosh-deployment/openstack/use-openstack-raw-stemcell.yml @@ -2,5 +2,5 @@ path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: bdefce154261d3b4d6e48c2aceb41af036e144f8 - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-openstack-kvm-ubuntu-bionic-go_agent-raw.tgz + sha1: 6070996d64dfd713177c1015129633bb0770673d + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-openstack-kvm-ubuntu-bionic-go_agent-raw.tgz diff --git a/src/bosh-deployment/runtime-configs/dns.yml b/src/bosh-deployment/runtime-configs/dns.yml index 84bd7cdc..113dabfa 100644 --- a/src/bosh-deployment/runtime-configs/dns.yml +++ b/src/bosh-deployment/runtime-configs/dns.yml @@ -4,6 +4,7 @@ addons: - os: ubuntu-trusty - os: ubuntu-xenial - os: ubuntu-bionic + - os: ubuntu-jammy jobs: - name: bosh-dns properties: @@ -48,9 +49,9 @@ addons: name: bosh-dns-windows releases: - name: bosh-dns - sha1: d7d38906db8f8030cb98574fba2d77092b9ec7bf - url: https://bosh.io/d/github.com/cloudfoundry/bosh-dns-release?v=1.30.0 - version: 1.30.0 + sha1: 8ad4f606296652ae8b32c4f05c44763cc67ded0c + url: https://bosh.io/d/github.com/cloudfoundry/bosh-dns-release?v=1.31.0 + version: 1.31.0 variables: - name: /dns_healthcheck_tls_ca options: diff --git a/src/bosh-deployment/uaa.yml b/src/bosh-deployment/uaa.yml index ae71e8c7..b9d4edad 100644 --- a/src/bosh-deployment/uaa.yml +++ b/src/bosh-deployment/uaa.yml @@ -3,9 +3,9 @@ type: replace value: name: uaa - sha1: 2583ae134bbe2c597246cca16c80de0b1b1543ef - url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/uaa-75.12.0-ubuntu-bionic-1.41-20211215-200249-606597073-20211215200253.tgz - version: 75.12.0 + sha1: ebb4155e3e89aa2038eb1995be0f1b79b50952a5 + url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/uaa-75.18.0-ubuntu-bionic-1.76-20220331-185123-123205046-20220331185127.tgz + version: 75.18.0 - path: /instance_groups/name=bosh/properties/director/user_management/provider type: replace value: uaa diff --git a/src/bosh-deployment/vcloud/cpi.yml b/src/bosh-deployment/vcloud/cpi.yml index ef868135..b0f580e1 100644 --- a/src/bosh-deployment/vcloud/cpi.yml +++ b/src/bosh-deployment/vcloud/cpi.yml @@ -10,8 +10,8 @@ path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 594a761651c440b945576c37def287c3476cef25 - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-openstack-kvm-ubuntu-bionic-go_agent.tgz + sha1: 454600bab1a7135b029eb2e6fe58634b3211c0d8 + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-openstack-kvm-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: diff --git a/src/bosh-deployment/virtualbox/cpi.yml b/src/bosh-deployment/virtualbox/cpi.yml index afb8b478..417665e1 100644 --- a/src/bosh-deployment/virtualbox/cpi.yml +++ b/src/bosh-deployment/virtualbox/cpi.yml @@ -10,8 +10,8 @@ path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 6b1c6a88e498b6b8538ea82bcc364bda86b693ed - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-vsphere-esxi-ubuntu-bionic-go_agent.tgz + sha1: 47ee6e0c5d059d8e570481f3378875e6138c0742 + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-vsphere-esxi-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: diff --git a/src/bosh-deployment/vsphere/cpi-secondary.yml b/src/bosh-deployment/vsphere/cpi-secondary.yml index 1ecbf257..7dddc250 100644 --- a/src/bosh-deployment/vsphere/cpi-secondary.yml +++ b/src/bosh-deployment/vsphere/cpi-secondary.yml @@ -3,9 +3,9 @@ type: replace value: name: bosh-vsphere-cpi - sha1: 3ac3de9b6e1ef5242e6abbae5d8a71a434b06b32 - url: https://bosh.io/d/github.com/cloudfoundry/bosh-vsphere-cpi-release?v=72 - version: 72 + sha1: e62604d5af353cac110fb455a8679abef53950d2 + url: https://bosh.io/d/github.com/cloudfoundry/bosh-vsphere-cpi-release?v=73 + version: 73 - path: /instance_groups/name=bosh/properties/vcenter? type: replace value: diff --git a/src/bosh-deployment/vsphere/cpi.yml b/src/bosh-deployment/vsphere/cpi.yml index c626c0ef..b7abffcd 100644 --- a/src/bosh-deployment/vsphere/cpi.yml +++ b/src/bosh-deployment/vsphere/cpi.yml @@ -3,15 +3,15 @@ type: replace value: name: bosh-vsphere-cpi - sha1: 3ac3de9b6e1ef5242e6abbae5d8a71a434b06b32 - url: https://bosh.io/d/github.com/cloudfoundry/bosh-vsphere-cpi-release?v=72 - version: 72 + sha1: e62604d5af353cac110fb455a8679abef53950d2 + url: https://bosh.io/d/github.com/cloudfoundry/bosh-vsphere-cpi-release?v=73 + version: 73 - name: stemcell path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 6b1c6a88e498b6b8538ea82bcc364bda86b693ed - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-vsphere-esxi-ubuntu-bionic-go_agent.tgz + sha1: 47ee6e0c5d059d8e570481f3378875e6138c0742 + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-vsphere-esxi-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: diff --git a/src/bosh-deployment/warden/cpi.yml b/src/bosh-deployment/warden/cpi.yml index 84ca793e..e3998493 100644 --- a/src/bosh-deployment/warden/cpi.yml +++ b/src/bosh-deployment/warden/cpi.yml @@ -10,8 +10,8 @@ path: /resource_pools/name=vms/stemcell? type: replace value: - sha1: 5ee4781aea5d58eeb98425e38d95e931756a9f50 - url: https://storage.googleapis.com/bosh-core-stemcells/1.41/bosh-stemcell-1.41-warden-boshlite-ubuntu-bionic-go_agent.tgz + sha1: bf999f542c313eee25c519c906781a1737021162 + url: https://storage.googleapis.com/bosh-core-stemcells/1.76/bosh-stemcell-1.76-warden-boshlite-ubuntu-bionic-go_agent.tgz - path: /resource_pools/name=vms/cloud_properties? type: replace value: