Skip to content

Commit e7f51df

Browse files
authored
feat: cloud-sql-proxy 2.0.0 and metrics support (#212)
1 parent 77ba60f commit e7f51df

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

catalog/sql/auth-proxy/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Launch a Cloud SQL Auth proxy instance as a DaemonSet in Kubernetes
1313
| connection-name | example-connection | str | 1 |
1414
| daemonset-name | cloud-sql-auth-proxy | str | 4 |
1515
| namespace | default | str | 1 |
16-
| project-id | | str | 2 |
16+
| project-id | | str | 3 |
1717
| service-account-name | cloud-sql-proxy-sa | str | 2 |
1818
| service-name | cloud-sql-auth-proxy | str | 1 |
1919
| servie-account-name | cloud-sql-auth-proxy | str | 1 |
@@ -29,6 +29,7 @@ This package has no sub-packages.
2929
|---------------------|-----------------------------------|-------------------|--------------------------------------|-----------|
3030
| daemonset.yaml | apps/v1 | DaemonSet | cloud-sql-auth-proxy | default |
3131
| iam.yaml | iam.cnrm.cloud.google.com/v1beta1 | IAMPolicyMember | iam-member-cloud-sql | default |
32+
| iam.yaml | iam.cnrm.cloud.google.com/v1beta1 | IAMPolicyMember | iam-member-cloudsql-metrics | default |
3233
| iam.yaml | iam.cnrm.cloud.google.com/v1beta1 | IAMServiceAccount | cloud-sql-auth-proxy | default |
3334
| iam.yaml | iam.cnrm.cloud.google.com/v1beta1 | IAMPolicy | iampolicy-cloud-sql-workloadidentity | default |
3435
| service.yaml | v1 | Service | cloud-sql-auth-proxy | default |

catalog/sql/auth-proxy/daemonset.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ spec:
3333
serviceAccountName: cloud-sql-proxy-sa # kpt-set: ${service-account-name}
3434
containers:
3535
- name: gce-proxy
36-
image: gcr.io/cloudsql-docker/gce-proxy:1.33.0
37-
command: ["/cloud_sql_proxy"]
38-
args: ["-instances=$(CONNECTION_NAME)=tcp:0.0.0.0:5432", "-ip_address_types=PRIVATE", "-log_debug_stdout=true", "-verbose=false"]
36+
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.0.0
37+
args: ["$(CONNECTION_NAME)", '--address=0.0.0.0', "--private-ip", "--structured-logs"]
3938
env:
4039
- name: CONNECTION_NAME
4140
value: "example-connection" # kpt-set: ${connection-name}

catalog/sql/auth-proxy/iam.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,22 @@ spec:
2828
external: projects/example-project # kpt-set: projects/${project-id}
2929
---
3030
apiVersion: iam.cnrm.cloud.google.com/v1beta1
31+
kind: IAMPolicyMember
32+
metadata:
33+
name: iam-member-cloudsql-metrics
34+
namespace: default
35+
annotations:
36+
cnrm.cloud.google.com/blueprint: cnrm/sql/auth-proxy/v0.1.0
37+
spec:
38+
memberFrom:
39+
serviceAccountRef:
40+
name: cloud-sql-auth-proxy
41+
role: roles/monitoring.metricWriter
42+
resourceRef:
43+
kind: Project
44+
external: projects/example-project # kpt-set: projects/${project-id}
45+
---
46+
apiVersion: iam.cnrm.cloud.google.com/v1beta1
3147
kind: IAMServiceAccount
3248
metadata:
3349
name: cloud-sql-auth-proxy

0 commit comments

Comments
 (0)