Skip to content

Commit

Permalink
Merge branch 'main' into release-please--branches--main--components--…
Browse files Browse the repository at this point in the history
…cloud-sql-proxy-operator
  • Loading branch information
hessjcg authored Sep 20, 2023
2 parents f2683b1 + bc94669 commit 6865c17
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/workload/podspec_updates.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 6865c17

Please sign in to comment.