Skip to content

Commit

Permalink
Merge branch 'main' into gh-402-quiet-flag
Browse files Browse the repository at this point in the history
  • Loading branch information
hessjcg authored Oct 24, 2023
2 parents 0146732 + 5a689ec commit d37d917
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [1.3.0](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/compare/v1.2.0...v1.3.0) (2023-10-17)


### Features

* Configure containerPort on proxy pod when telemetry is enabled ([#442](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/issues/442)) ([a13ca22](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/commit/a13ca224737d845b3faa8b7b066475d59ad9ddb9))


### Bug Fixes

* Correct the name of the quit url envvar CSQL_PROXY_QUIT_URLS. ([#454](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/issues/454)) ([bd75451](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/commit/bd75451235366725642894f454a3ce588bc4422d))

## [1.2.0](https://github.com/GoogleCloudPlatform/cloud-sql-proxy-operator/compare/v1.1.0...v1.2.0) (2023-09-20)


Expand Down
2 changes: 1 addition & 1 deletion installer/cloud-sql-proxy-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ spec:
- --leader-elect
command:
- /manager
image: gcr.io/cloud-sql-connectors/cloud-sql-operator/cloud-sql-proxy-operator:1.2.0
image: gcr.io/cloud-sql-connectors/cloud-sql-operator/cloud-sql-proxy-operator:1.3.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
4 changes: 2 additions & 2 deletions installer/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

set -euxo # exit 1 from the script when command fails

# If CSQL_OPERATOR_VERSION is not set, use the release version: v1.2.0.
CSQL_OPERATOR_VERSION="${CSQL_OPERATOR_VERSION:-v1.2.0}"
# If CSQL_OPERATOR_VERSION is not set, use the release version: v1.3.0.
CSQL_OPERATOR_VERSION="${CSQL_OPERATOR_VERSION:-v1.3.0}"

# If CSQL_CERT_MANAGER_VERSION is not set, use the default: v1.13.1.
CSQL_CERT_MANAGER_VERSION="${CSQL_CERT_MANAGER_VERSION:-v1.13.1}"
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.3.0

0 comments on commit d37d917

Please sign in to comment.