Merge ../bucc into HEAD

Qarik-Group · Apr 6, 2022 · cfba06b · cfba06b
2 parents a8078e4 + 8103a19
commit cfba06b
Show file tree

Hide file tree

Showing 45 changed files with 122 additions and 341 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-## Version: 0.11.3
+## Version: 0.11.4
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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