diff --git a/Makefile b/Makefile index f88c4111..d0a6ecbc 100644 --- a/Makefile +++ b/Makefile @@ -124,8 +124,9 @@ go_fmt: # Automatically formats go files go mod tidy go run golang.org/x/tools/cmd/goimports@latest -w . -yaml_fmt: # Automatically formats all yaml files - go run github.com/UltiRequiem/yamlfmt@latest -w $(shell find . -iname '*.yaml' -or -iname '*.yml' | grep -v -e '^./bin/' | grep -v -e '^./.github/workflows/') +yaml_fmt: # Automatically format config/ to make generated and handwritten k8s yaml files consistent + go run github.com/UltiRequiem/yamlfmt@latest -w \ + $(shell find ./config -iname '*.yaml' -or -iname '*.yml') $(shell find ./installer -iname '*.yaml' -or -iname '*.yml') .PHONY: add_copyright_header add_copyright_header: # Add the copyright header diff --git a/internal/workload/podspec_updates.go b/internal/workload/podspec_updates.go index 958b5e64..70f0a254 100644 --- a/internal/workload/podspec_updates.go +++ b/internal/workload/podspec_updates.go @@ -39,7 +39,7 @@ const ( // DefaultProxyImage is the latest version of the proxy as of the release // of this operator. This is managed as a dependency. We update this constant // when the Cloud SQL Auth Proxy releases a new version. - DefaultProxyImage = "gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.6.1" + DefaultProxyImage = "gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.7.0" // DefaultFirstPort is the first port number chose for an instance listener by the // proxy.