Skip to content

Commit 6f6b7ae

Browse files
committed
Merge remote-tracking branch 'origin/main' into snitch_bbl_9.0.36
2 parents 9f3fc4e + 442068e commit 6f6b7ae

File tree

22 files changed

+3678
-2527
lines changed

22 files changed

+3678
-2527
lines changed

ci/infrastructure.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,13 @@ upgrade-bbl-up-task: &upgrade-bbl-up-task-config
130130
BBL_GCP_REGION: us-east1
131131
BBL_GCP_SERVICE_ACCOUNT_KEY: environments/test/trelawney/trelawney.key.json
132132
BBL_IAAS: gcp
133-
BBL_LB_CERT: ../lb-certs/trelawney.crt
134-
BBL_LB_KEY: ../lb-certs/trelawney.key
133+
BBL_LB_CERT: ((trelawney_lb.certificate))
134+
BBL_LB_KEY: ((trelawney_lb.private_key))
135135
BBL_STATE_DIR: environments/test/trelawney/bbl-state
136136
GIT_COMMIT_EMAIL: "app-deployments@cloudfoundry.org"
137137
GIT_COMMIT_USERNAME: "ARD WG Bot"
138138
LB_DOMAIN: cf.trelawney.env.wg-ard.ci.cloudfoundry.org
139+
TRUSTED_CA: ((relint_ca.certificate))
139140
ensure:
140141
put: relint-envs
141142
params:
@@ -251,12 +252,13 @@ windows-bbl-up-task: &windows-bbl-up-task-config
251252
BBL_GCP_REGION: us-east1
252253
BBL_GCP_SERVICE_ACCOUNT_KEY: environments/test/cedric/cedric.key.json
253254
BBL_IAAS: gcp
254-
BBL_LB_CERT: ../cert.pem
255-
BBL_LB_KEY: ../key.pem
255+
BBL_LB_CERT: ((cedric_lb.certificate))
256+
BBL_LB_KEY: ((cedric_lb.private_key))
256257
BBL_STATE_DIR: environments/test/cedric/bbl-state
257258
GIT_COMMIT_EMAIL: "app-deployments@cloudfoundry.org"
258259
GIT_COMMIT_USERNAME: "ARD WG Bot"
259260
LB_DOMAIN: cf.cedric.env.wg-ard.ci.cloudfoundry.org
261+
TRUSTED_CA: ((relint_ca.certificate))
260262
ensure:
261263
put: relint-envs
262264
params:
@@ -297,12 +299,13 @@ cats-bbl-up-task: &cats-bbl-up-task-config
297299
BBL_GCP_SERVICE_ACCOUNT_KEY: environments/test/cats/ard-cats.key.json
298300
BBL_GCP_REGION: us-east1
299301
BBL_IAAS: gcp
300-
BBL_LB_CERT: ../lb-certs/cats.crt
301-
BBL_LB_KEY: ../lb-certs/cats.key
302+
BBL_LB_CERT: ((cats_lb.certificate))
303+
BBL_LB_KEY: ((cats_lb.private_key))
302304
BBL_STATE_DIR: environments/test/cats/bbl-state
303305
GIT_COMMIT_EMAIL: "app-deployments@cloudfoundry.org"
304306
GIT_COMMIT_USERNAME: "ARD WG Bot"
305307
LB_DOMAIN: cf.cats.env.wg-ard.ci.cloudfoundry.org
308+
TRUSTED_CA: ((relint_ca.certificate))
306309
ensure:
307310
put: relint-envs
308311
params:
@@ -825,11 +828,12 @@ jobs:
825828
BBL_ENV_NAME: maxime
826829
BBL_GCP_SERVICE_ACCOUNT_KEY: environments/dev/maxime/maxime.key.json
827830
BBL_GCP_REGION: us-east1
828-
BBL_LB_CERT: ../certs/maxime.crt
829-
BBL_LB_KEY: ../certs/maxime.key
831+
BBL_LB_CERT: ((maxime_lb.certificate))
832+
BBL_LB_KEY: ((maxime_lb.private_key))
830833
GIT_COMMIT_EMAIL: "app-deployments@cloudfoundry.org"
831834
GIT_COMMIT_USERNAME: "ARD WG Bot"
832835
LB_DOMAIN: cf.maxime.env.wg-ard.ci.cloudfoundry.org
836+
TRUSTED_CA: ((relint_ca.certificate))
833837
ensure:
834838
put: relint-envs
835839
params:

ci/resources/stemcell-version-bump/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.24.0
55
toolchain go1.24.1
66

77
require (
8-
cloud.google.com/go/storage v1.57.1
8+
cloud.google.com/go/storage v1.57.2
99
github.com/stretchr/testify v1.11.1
10-
google.golang.org/api v0.255.0
10+
google.golang.org/api v0.256.0
1111
)
1212

1313
require (
@@ -32,7 +32,7 @@ require (
3232
github.com/go-logr/stdr v1.2.2 // indirect
3333
github.com/google/s2a-go v0.1.9 // indirect
3434
github.com/google/uuid v1.6.0 // indirect
35-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
35+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
3636
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
3737
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
3838
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -49,14 +49,14 @@ require (
4949
go.opentelemetry.io/otel/trace v1.37.0 // indirect
5050
golang.org/x/crypto v0.43.0 // indirect
5151
golang.org/x/net v0.46.0 // indirect
52-
golang.org/x/oauth2 v0.32.0 // indirect
53-
golang.org/x/sync v0.17.0 // indirect
52+
golang.org/x/oauth2 v0.33.0 // indirect
53+
golang.org/x/sync v0.18.0 // indirect
5454
golang.org/x/sys v0.37.0 // indirect
5555
golang.org/x/text v0.30.0 // indirect
5656
golang.org/x/time v0.14.0 // indirect
5757
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
5858
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
59-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
59+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
6060
google.golang.org/grpc v1.76.0 // indirect
6161
google.golang.org/protobuf v1.36.10 // indirect
6262
gopkg.in/yaml.v3 v3.0.1 // indirect

ci/resources/stemcell-version-bump/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
1212
cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
1313
cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
1414
cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
15-
cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
16-
cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
15+
cloud.google.com/go/longrunning v0.7.0 h1:FV0+SYF1RIj59gyoWDRi45GiYUMM3K1qO51qoboQT1E=
16+
cloud.google.com/go/longrunning v0.7.0/go.mod h1:ySn2yXmjbK9Ba0zsQqunhDkYi0+9rlXIwnoAf+h+TPY=
1717
cloud.google.com/go/monitoring v1.24.2 h1:5OTsoJ1dXYIiMiuL+sYscLc9BumrL3CarVLL7dd7lHM=
1818
cloud.google.com/go/monitoring v1.24.2/go.mod h1:x7yzPWcgDRnPEv3sI+jJGBkwl5qINf+6qY4eq0I9B4U=
19-
cloud.google.com/go/storage v1.57.1 h1:gzao6odNJ7dR3XXYvAgPK+Iw4fVPPznEPPyNjbaVkq8=
20-
cloud.google.com/go/storage v1.57.1/go.mod h1:329cwlpzALLgJuu8beyJ/uvQznDHpa2U5lGjWednkzg=
19+
cloud.google.com/go/storage v1.57.2 h1:sVlym3cHGYhrp6XZKkKb+92I1V42ks2qKKpB0CF5Mb4=
20+
cloud.google.com/go/storage v1.57.2/go.mod h1:n5ijg4yiRXXpCu0sJTD6k+eMf7GRrJmPyr9YxLXGHOk=
2121
cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
2222
cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
2323
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 h1:UQUsRi8WTzhZntp5313l+CHIAT95ojUI2lpP/ExlZa4=
@@ -61,8 +61,8 @@ github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
6161
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
6262
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6363
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
64-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
65-
github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
64+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 h1:zrn2Ee/nWmHulBx5sAVrGgAa0f2/R35S4DJwfFaUPFQ=
65+
github.com/googleapis/enterprise-certificate-proxy v0.3.7/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
6666
github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
6767
github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
6868
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -105,10 +105,10 @@ golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
105105
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
106106
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
107107
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
108-
golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
109-
golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
110-
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
111-
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
108+
golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
109+
golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
110+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
111+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
112112
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
113113
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
114114
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
@@ -117,14 +117,14 @@ golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
117117
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
118118
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
119119
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
120-
google.golang.org/api v0.255.0 h1:OaF+IbRwOottVCYV2wZan7KUq7UeNUQn1BcPc4K7lE4=
121-
google.golang.org/api v0.255.0/go.mod h1:d1/EtvCLdtiWEV4rAEHDHGh2bCnqsWhw+M8y2ECN4a8=
120+
google.golang.org/api v0.256.0 h1:u6Khm8+F9sxbCTYNoBHg6/Hwv0N/i+V94MvkOSor6oI=
121+
google.golang.org/api v0.256.0/go.mod h1:KIgPhksXADEKJlnEoRa9qAII4rXcy40vfI8HRqcU964=
122122
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
123123
google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
124124
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c h1:AtEkQdl5b6zsybXcbz00j1LwNodDuH6hVifIaNqk7NQ=
125125
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c/go.mod h1:ea2MjsO70ssTfCjiwHgI0ZFqcw45Ksuk2ckf9G468GA=
126-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=
127-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
126+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 h1:tRPGkdGHuewF4UisLzzHHr1spKw92qLM98nIzxbC0wY=
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
128128
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
129129
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
130130
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=

ci/resources/stemcell-version-bump/vendor/cloud.google.com/go/storage/.repo-metadata.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/resources/stemcell-version-bump/vendor/cloud.google.com/go/storage/CHANGES.md

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/resources/stemcell-version-bump/vendor/cloud.google.com/go/storage/grpc_client.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/resources/stemcell-version-bump/vendor/cloud.google.com/go/storage/grpc_writer.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/resources/stemcell-version-bump/vendor/cloud.google.com/go/storage/internal/apiv2/.repo-metadata.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)