Merge pull request #12 from giuseppealbrizio/development

update cloud sql gke config

Author: giuseppealbrizio

infra/k8s-dev/deployments/servicename-depl.yaml

@@ -174,27 +174,23 @@ spec:
         - name: cloud-sql-proxy
           # It is recommended to use the latest version of the Cloud SQL proxy
           # Make sure to update on a regular schedule!
-          image: gcr.io/cloudsql-docker/gce-proxy:1.28.0 # make sure the use the latest version
-          command:
-            - '/cloud_sql_proxy'
-
+          image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.1.0
+          args:
             # If connecting from a VPC-native GKE cluster, you can use the
             # following flag to have the proxy connect over private IP
-            # - "-ip_address_types=PRIVATE"
-
-            # By default, the proxy will write all logs to stderr. In some
-            # environments, anything printed to stderr is consider an error. To
-            # disable this behavior and write all logs to stdout (except errors
-            # which will still go to stderr), use:
-            - '-log_debug_stdout'
+            # - "--private-ip"
 
-            # Replace DB_PORT with the port the proxy should listen on
+            # Enable structured logging with LogEntry format:
+            - "--structured-logs"
+            
             # Defaults: MySQL: 3306, Postgres: 5432, SQLServer: 1433
-            - '-instances=instance-name=tcp:3306'
+            # Replace DB_PORT with the port the proxy should listen on
+            - "--port=3306"
+            - "cloud-sql-instances=instance-name"
 
             # [START cloud_sql_proxy_k8s_volume_mount]
             # This flag specifies where the service account key can be found
-            - '-credential_file=/var/secrets/google/proxy-to-another-gcp-project.json'
+            - '--credentials-file=/var/secrets/google/proxy-to-another-gcp-project.json'
           securityContext:
             # The default Cloud SQL proxy image runs as the
             # "nonroot" user and group (uid: 65532) by default.

infra/k8s/deployments/servicename-depl.yaml

@@ -61,11 +61,11 @@ spec:
             - name: HOST
               value: '0.0.0.0'
             - name: SERVICE_NAME
-              value: "your_service_name"
+              value: 'your_service_name'
             - name: PORT
-              value: "3000"
+              value: '3000'
             - name: HASH
-              value: "10"
+              value: '10'
 
             #JWT CONFIGURATION
             - name: JWT_KEY
@@ -206,27 +206,23 @@ spec:
         - name: cloud-sql-proxy
           # It is recommended to use the latest version of the Cloud SQL proxy
           # Make sure to update on a regular schedule!
-          image: gcr.io/cloudsql-docker/gce-proxy:1.28.0 # make sure the use the latest version
-          command:
-            - '/cloud_sql_proxy'
-
+          image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.1.0
+          args:
             # If connecting from a VPC-native GKE cluster, you can use the
             # following flag to have the proxy connect over private IP
-            # - "-ip_address_types=PRIVATE"
+            # - "--private-ip"
 
-            # By default, the proxy will write all logs to stderr. In some
-            # environments, anything printed to stderr is consider an error. To
-            # disable this behavior and write all logs to stdout (except errors
-            # which will still go to stderr), use:
-            - '-log_debug_stdout'
+            # Enable structured logging with LogEntry format:
+            - '--structured-logs'
 
-            # Replace DB_PORT with the port the proxy should listen on
             # Defaults: MySQL: 3306, Postgres: 5432, SQLServer: 1433
-            - '-instances=mysql-instance-name=tcp:3306'
+            # Replace DB_PORT with the port the proxy should listen on
+            - '--port=3306'
+            - 'cloud-sql-instances=instance-name'
 
             # [START cloud_sql_proxy_k8s_volume_mount]
             # This flag specifies where the service account key can be found
-            - '-credential_file=/var/secrets/google/proxy-to-another-gcp-project.json'
+            - '--credentials-file=/var/secrets/google/proxy-to-another-gcp-project.json'
           securityContext:
             # The default Cloud SQL proxy image runs as the
             # "nonroot" user and group (uid: 65532) by default.