Skip to content

Commit 5ba29fb

Browse files
bonzofenixbonzofenix
authored
Merge branch 'main' into 885-enable-scalingengine-via-mtar
2 parents 9df88a4 + 20363fb commit 5ba29fb

File tree

11 files changed

+88
-72
lines changed

11 files changed

+88
-72
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
# Initializes the CodeQL tools for scanning.
5353
- name: Initialize CodeQL
54-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
54+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
5555
with:
5656
languages: ${{ matrix.language }}
5757
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,4 +63,4 @@ jobs:
6363
run: make generate-openapi-generated-clients-and-servers scheduler.build
6464

6565
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
66+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3

‎.github/workflows/image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
6363
- name: Build and push
6464
id: build-and-push
65-
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6
65+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
6666
with:
6767
context: ci/dockerfiles/autoscaler-${{ matrix.image_suffix }}
6868
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

‎.github/workflows/mysql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
DB_PASSWORD: root
2222
runs-on: "ubuntu-latest"
2323
container:
24-
image: "ubuntu:noble@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233"
24+
image: "ubuntu:noble@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f"
2525
continue-on-error: true
2626
name: Build suite=${{ matrix.suite }}, mysql=${{ matrix.mysql }}
2727
services:

‎.github/workflows/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
DB_PASSWORD: postgres
2222
runs-on: "ubuntu-latest"
2323
container:
24-
image: "ubuntu:noble@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233"
24+
image: "ubuntu:noble@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f"
2525
continue-on-error: true
2626
name: Build suite=${{ matrix.suite }}, postgres=${{ matrix.postgres }}
2727
services:

‎ci/autoscaler/pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,17 +571,17 @@ jobs:
571571
- put: mtar-bucket
572572
params:
573573
file: "build/artifacts/app-autoscaler-release-v*.mtar"
574+
- put: app-autoscaler-release
575+
params:
576+
rebase: true
577+
repository: app-autoscaler-release
578+
tag: build/tag
574579
- put: gh-release
575580
params:
576581
name: build/name
577582
tag: build/tag
578583
body: build/changelog.md
579584
globs: [build/artifacts/*]
580-
commitish: app-autoscaler-release/.git/ref
581-
- put: app-autoscaler-release
582-
params:
583-
rebase: true
584-
repository: app-autoscaler-release
585585

586586
- name: cleanup-autoscaler-deployments
587587
public: true

‎ci/dockerfiles/autoscaler-tools/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:noble@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
1+
FROM ubuntu:noble@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f
22
MAINTAINER autoscaler-team
33

44
ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
@@ -63,14 +63,14 @@ RUN apt-get update && \
6363

6464
# Install bosh_cli
6565
# renovate: datasource=github-releases depName=bosh-cli lookupName=cloudfoundry/bosh-cli
66-
ARG BOSH_VERSION=7.9.5
66+
ARG BOSH_VERSION=7.9.7
6767
RUN wget -q https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_VERSION}/bosh-cli-${BOSH_VERSION}-linux-amd64 && \
6868
mv bosh-cli-* /usr/local/bin/bosh && \
6969
chmod +x /usr/local/bin/bosh
7070

7171
# Install bbl
7272
# renovate: datasource=github-releases depName=bosh-bootloader lookupName=cloudfoundry/bosh-bootloader
73-
ARG BBL_VERSION=v9.0.34
73+
ARG BBL_VERSION=v9.0.35
7474
RUN wget -q https://github.com/cloudfoundry/bosh-bootloader/releases/download/${BBL_VERSION}/bbl-${BBL_VERSION}_linux_amd64 && \
7575
mv bbl-* /usr/local/bin/bbl &&\
7676
chmod +x /usr/local/bin/bbl &&\

‎src/autoscaler/dbtasks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.postgresql</groupId>
3939
<artifactId>postgresql</artifactId>
40-
<version>42.7.5</version>
40+
<version>42.7.7</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>com.mysql</groupId>

‎src/autoscaler/go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ require (
99
code.cloudfoundry.org/go-log-cache/v3 v3.1.1
1010
code.cloudfoundry.org/go-loggregator/v10 v10.2.0
1111
code.cloudfoundry.org/lager/v3 v3.37.0
12-
code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20250517042608-bc715c8bfcaf
13-
code.cloudfoundry.org/tlsconfig v0.27.0
12+
code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20250616083640-bd8b2c38dbe2
13+
code.cloudfoundry.org/tlsconfig v0.29.0
1414
github.com/cenkalti/backoff/v5 v5.0.2
1515
github.com/cloud-gov/go-cfenv v1.19.1
1616
github.com/go-chi/chi/v5 v5.2.1
1717
github.com/go-faster/errors v0.7.1
1818
github.com/go-faster/jx v1.1.0
19-
github.com/go-logr/logr v1.4.2
19+
github.com/go-logr/logr v1.4.3
2020
github.com/go-sql-driver/mysql v1.9.2
2121
github.com/google/uuid v1.6.0
2222
github.com/gorilla/mux v1.8.1
@@ -41,19 +41,19 @@ require (
4141
go.opentelemetry.io/otel/metric v1.35.0
4242
go.opentelemetry.io/otel/sdk v1.35.0
4343
go.opentelemetry.io/otel/trace v1.35.0
44-
golang.org/x/crypto v0.38.0
45-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
46-
golang.org/x/net v0.40.0
44+
golang.org/x/crypto v0.39.0
45+
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476
46+
golang.org/x/net v0.41.0
4747
golang.org/x/time v0.11.0
48-
google.golang.org/grpc v1.72.1
48+
google.golang.org/grpc v1.73.0
4949
gopkg.in/yaml.v3 v3.0.1
5050
)
5151

52-
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250519155744-55703ea1f237
52+
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250603155806-513f23925822
5353

5454
require (
5555
code.cloudfoundry.org/go-diodes v0.0.0-20250505082646-e4c2d772c2ec // indirect
56-
code.cloudfoundry.org/go-metric-registry v0.0.0-20250512163413-c16153523050 // indirect
56+
code.cloudfoundry.org/go-metric-registry v0.0.0-20250611124144-ca953cadd16e // indirect
5757
filippo.io/edwards25519 v1.1.0 // indirect
5858
github.com/andybalholm/brotli v1.1.1 // indirect
5959
github.com/beorn7/perks v1.0.1 // indirect
@@ -71,7 +71,7 @@ require (
7171
github.com/go-logr/stdr v1.2.2 // indirect
7272
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7373
github.com/google/go-cmp v0.7.0 // indirect
74-
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
74+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
7575
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
7676
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7777
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -97,13 +97,13 @@ require (
9797
go.uber.org/automaxprocs v1.6.0 // indirect
9898
go.uber.org/multierr v1.11.0 // indirect
9999
go.uber.org/zap v1.27.0 // indirect
100-
golang.org/x/mod v0.24.0 // indirect
101-
golang.org/x/sync v0.14.0 // indirect
100+
golang.org/x/mod v0.25.0 // indirect
101+
golang.org/x/sync v0.15.0 // indirect
102102
golang.org/x/sys v0.33.0 // indirect
103-
golang.org/x/text v0.25.0 // indirect
104-
golang.org/x/tools v0.33.0 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
103+
golang.org/x/text v0.26.0 // indirect
104+
golang.org/x/tools v0.34.0 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
107107
google.golang.org/protobuf v1.36.6 // indirect
108108
gopkg.in/yaml.v2 v2.4.0 // indirect
109109
)

0 commit comments

Comments
 (0)