Skip to content

Commit 80dc919

Browse files
panavenuepanavenue
authored
Merge branch 'main' into march2026_release
2 parents 37812d6 + 5d39dab commit 80dc919

29 files changed

Lines changed: 338 additions & 325 deletions

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,26 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
45+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4646

4747
- name: Setup Go
48-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
48+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
4949
with:
50-
go-version: "1.24"
50+
go-version: "1.25"
5151
if: ${{ matrix.language == 'go' }}
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
55+
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
5656
with:
5757
languages: ${{ matrix.language }}
5858

5959
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
6060
# If this step fails, then you should remove it and run the build manually
6161
- name: Autobuild
62-
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
62+
uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
6363

6464
- name: Perform CodeQL Analysis
65-
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
65+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
6666
with:
6767
category: "/language:${{matrix.language}}"

‎.github/workflows/labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
- uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/scorecard.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: "Checkout code"
38-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3939
with:
4040
persist-credentials: false
4141

@@ -57,14 +57,14 @@ jobs:
5757
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5858
# format to the repository Actions tab.
5959
- name: "Upload artifact"
60-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
60+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6161
with:
6262
name: SARIF file
6363
path: results.sarif
6464
retention-days: 5
6565

6666
# Upload the results to GitHub's code scanning dashboard.
6767
- name: "Upload to code-scanning"
68-
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
68+
uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
6969
with:
7070
sarif_file: resultsFiltered.sarif

‎.github/workflows/tests-main.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ jobs:
2929
id-token: "write"
3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
- id: auth
3434
name: Authenticate to Google Cloud
35-
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
35+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
3636
with:
3737
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
3838
service_account: ${{ vars.SERVICE_ACCOUNT }}
3939
access_token_lifetime: 600s
4040
- name: Setup Go
41-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
41+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
4242
with:
43-
go-version: "1.24"
43+
go-version: "1.25"
4444
- name: Set up build.env with phony secrets.
4545
run: cp build.sample.env build.env
4646
- name: make test
@@ -69,32 +69,32 @@ jobs:
6969
id-token: write
7070
steps:
7171
- name: Checkout code
72-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
72+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7373
- id: auth
7474
name: Authenticate to Google Cloud
75-
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
75+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
7676
with:
7777
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
7878
service_account: ${{ vars.SERVICE_ACCOUNT }}
7979
access_token_lifetime: 600s
8080
- id: secrets
8181
name: Get secrets
82-
uses: google-github-actions/get-secretmanager-secrets@dc4a1392bad0fd60aee00bb2097e30ef07a1caae # v2.1.3
82+
uses: google-github-actions/get-secretmanager-secrets@bc9c54b29fdffb8a47776820a7d26e77b379d262 # v3.0.0
8383
with:
8484
secrets: |-
8585
NODEPOOL_SERVICEACCOUNT_EMAIL:${{ vars.GOOGLE_CLOUD_PROJECT }}/NODEPOOL_SERVICEACCOUNT_EMAIL
8686
TFSTATE_STORAGE_BUCKET:${{ vars.GOOGLE_CLOUD_PROJECT }}/TFSTATE_STORAGE_BUCKET
8787
WORKLOAD_ID_SERVICEACCOUNT_EMAIL:${{ vars.GOOGLE_CLOUD_PROJECT }}/WORKLOAD_ID_SERVICEACCOUNT_EMAIL
8888
- name: Set up Cloud SDK
89-
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
89+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
9090
- name: "Setup Go"
91-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
91+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
9292
with:
93-
go-version: "1.24"
93+
go-version: "1.25"
9494
- name: Set up QEMU
95-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
95+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
9696
- name: Set up Docker Buildx
97-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
97+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
9898
- id: e2e
9999
name: Run E2E Tests
100100
run: "./tools/e2e_test_job.sh"

‎.github/workflows/tests.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Setup Go
29-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
29+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
3030
with:
31-
go-version: "1.24"
31+
go-version: "1.25"
3232
- name: Checkout code
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434
with:
3535
ref: ${{ github.event.pull_request.head.sha }}
3636
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -48,32 +48,32 @@ jobs:
4848
id-token: write
4949
steps:
5050
- name: Checkout code
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
51+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5252
- id: auth
5353
name: Authenticate to Google Cloud
54-
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
54+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
5555
with:
5656
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
5757
service_account: ${{ vars.SERVICE_ACCOUNT }}
5858
access_token_lifetime: 600s
5959
- id: secrets
6060
name: Get secrets
61-
uses: google-github-actions/get-secretmanager-secrets@dc4a1392bad0fd60aee00bb2097e30ef07a1caae # v2.1.3
61+
uses: google-github-actions/get-secretmanager-secrets@bc9c54b29fdffb8a47776820a7d26e77b379d262 # v3.0.0
6262
with:
6363
secrets: |-
6464
NODEPOOL_SERVICEACCOUNT_EMAIL:${{ vars.GOOGLE_CLOUD_PROJECT }}/NODEPOOL_SERVICEACCOUNT_EMAIL
6565
TFSTATE_STORAGE_BUCKET:${{ vars.GOOGLE_CLOUD_PROJECT }}/TFSTATE_STORAGE_BUCKET
6666
WORKLOAD_ID_SERVICEACCOUNT_EMAIL:${{ vars.GOOGLE_CLOUD_PROJECT }}/WORKLOAD_ID_SERVICEACCOUNT_EMAIL
6767
- name: Set up Cloud SDK
68-
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
68+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
6969
- name: Setup Go
70-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
70+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
7171
with:
72-
go-version: "1.24"
72+
go-version: "1.25"
7373
- name: Set up QEMU
74-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
74+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
7575
- name: Set up Docker Buildx
76-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
76+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
7777
- id: e2e
7878
name: "Run E2E Tests"
7979
run: "./tools/e2e_test_job.sh"

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ config/rbac/role.yaml
4343
internal/api/v1/zz_generated.deepcopy.go
4444
installer/install.sh
4545
installer/cloud-sql-proxy-operator.yaml
46+
.tools
47+
.envrc

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## [1.7.6](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/compare/v1.7.5...v1.7.6) (2026-03-11)
4+
5+
6+
### Bug Fixes
7+
8+
* migrate away from kube-rbac-proxy (critical) ([#747](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/issues/747)) ([9718f37](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/commit/9718f37bf41af42ba88bd70ada61f1036bcee26c))
9+
10+
## [1.7.5](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/compare/v1.7.4...v1.7.5) (2026-02-20)
11+
12+
13+
### Bug Fixes
14+
15+
* k8s 1.34 baseline PSA compliance ([#745](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/issues/745)) ([e80b841](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/commit/e80b841858c7f9f6c0fe4d901eb5ccdc1297b832))
16+
* Update Auth Proxy to version 2.21.1. ([#746](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/issues/746)) ([a3ed097](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/commit/a3ed0970d782e0ed7e65a9228c5c709e61833d6b))
17+
* Update dependencies to latest as of 2026-02-13 ([#742](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/issues/742)) ([dab2607](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/commit/dab2607df7fa9d58380d639a8d0b66e2ab3c7487))
18+
319
## [1.7.4](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/compare/v1.7.3...v1.7.4) (2026-01-23)
420

521

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Use distroless as minimal base image to package the manager binary
1616
# Refer to https://github.com/GoogleContainerTools/distroless for more details
17-
FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
17+
FROM gcr.io/distroless/static:nonroot@sha256:64c43684e6d2b581d1eb362ea47b6a4defee6a9cac5f7ebbda3daa67e8c9b8e6
1818

1919
# For multi-arch builds, use automatic platform build arguments
2020
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

‎Dockerfile-operator‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
2828

2929
# Use distroless as minimal base image to package the manager binary
3030
# Refer to https://github.com/GoogleContainerTools/distroless for more details
31-
FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
31+
FROM gcr.io/distroless/static:nonroot@sha256:64c43684e6d2b581d1eb362ea47b6a4defee6a9cac5f7ebbda3daa67e8c9b8e6
3232

3333
# For multi-arch builds, use automatic platform build arguments
3434
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

‎Makefile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ generate: ctrl_generate ctrl_manifests generate_crd_docs go_lint tf_lint instal
9090
build: generate build_push_docker ## Builds and pushes the docker image to tag defined in envvar IMG
9191
@echo "TIME: $(shell date) end make build"
9292

93+
.PHONY: build_docker_local
94+
build_docker_local: generate build_docker ## Builds the docker image but does not push
95+
@echo "TIME: $(shell date) end make build"
96+
9397
.PHONY: test
9498
test: generate go_test go_test_k8s_1_28 ## Run tests (but not internal/teste2e)
9599
@echo "TIME: $(shell date) end make test"
@@ -151,6 +155,15 @@ build_push_docker: # Build docker image with the operator. set IMG env var befor
151155
test -d 'bin' || mkdir -p bin
152156
echo "$(IMG)" > bin/last-pushed-image-url.txt
153157

158+
.PHONY: build_docker
159+
build_docker: # Build docker image with the operator. set IMG env var before running: `IMG=example.com/img:1.0 make build`
160+
docker buildx build --platform "linux/amd64" \
161+
--build-arg GO_LD_FLAGS="$(VERSION_LDFLAGS)" \
162+
-f "Dockerfile-operator" \
163+
"$(PWD)"
164+
test -d 'bin' || mkdir -p bin
165+
echo "$(IMG)" > bin/last-pushed-image-url.txt
166+
154167
.PHONY: go_lint
155168
go_lint: golangci-lint # Run go lint tools, fail if unchecked errors
156169
# Implements golang CI based on settings described here:

0 commit comments

Comments
 (0)