feat: Add flag quite to proxy. Fixes #402

GoogleCloudPlatform · Oct 17, 2023 · f00635d · f00635d
1 parent 4f9bd1f
commit f00635d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/config/crd/bases/cloudsql.cloud.google.com_authproxyworkloads.yaml b/config/crd/bases/cloudsql.cloud.google.com_authproxyworkloads.yaml
@@ -891,6 +891,9 @@ spec:
                       format: int64
                       minimum: 0
                       type: integer
+                    quiet:
+                      description: Quiet configures the proxy's --quiet flag to limit the amount of logging generated by the proxy container.
+                      type: boolean
                     resources:
                       description: Resources specifies the resources required for the proxy pod.
                       properties:

diff --git a/docs/api.md b/docs/api.md
@@ -52,6 +52,7 @@ _Appears in:_
  The operator ensures that all workloads configured with the default proxy image are upgraded automatically to use to the latest released proxy image. 
  When the customer upgrades the operator, the operator upgrades all workloads using the default proxy image to the latest proxy image. The change to the proxy container image is applied in accordance with the RolloutStrategy. |
 | `rolloutStrategy` _string_ | RolloutStrategy indicates the strategy to use when rolling out changes to the workloads affected by the results. When this is set to `Workload`, changes to this resource will be automatically applied to a running Deployment, StatefulSet, DaemonSet, or ReplicaSet in accordance with the Strategy set on that workload. When this is set to `None`, the operator will take no action to roll out changes to affected workloads. `Workload` will be used by default if no value is set. See: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy |
+| `quiet` _boolean_ | Quiet configures the proxy's --quiet flag to limit the amount of logging generated by the proxy container. |
 
 
 #### AuthProxyWorkload

diff --git a/installer/cloud-sql-proxy-operator.yaml b/installer/cloud-sql-proxy-operator.yaml
@@ -910,6 +910,9 @@ spec:
                       format: int64
                       minimum: 0
                       type: integer
+                    quiet:
+                      description: Quiet configures the proxy's --quiet flag to limit the amount of logging generated by the proxy container.
+                      type: boolean
                     resources:
                       description: Resources specifies the resources required for the proxy pod.
                       properties:

diff --git a/internal/api/v1/authproxyworkload_types.go b/internal/api/v1/authproxyworkload_types.go
@@ -205,6 +205,10 @@ type AuthProxyContainerSpec struct {
 	//+kubebuilder:validation:Enum=Workload;None
 	//+kubebuilder:default=Workload
 	RolloutStrategy string `json:"rolloutStrategy,omitempty"`
+
+	// Quiet configures the proxy's --quiet flag to limit the amount of
+	// logging generated by the proxy container.
+	Quiet bool `json:"quiet,omitempty"`
 }
 
 // AdminServerSpec specifies how to start the proxy's admin server:

diff --git a/internal/workload/podspec_updates.go b/internal/workload/podspec_updates.go
@@ -596,6 +596,11 @@ func (s *updateState) updateContainer(p *cloudsqlapi.AuthProxyWorkload, c *corev
 	// configure structured logs
 	s.addProxyContainerEnvVar(p, "CSQL_PROXY_STRUCTURED_LOGS", "true")
 
+	// configure quiet logs
+	if p.Spec.AuthProxyContainer != nil && p.Spec.AuthProxyContainer.Quiet {
+		s.addProxyContainerEnvVar(p, "CSQL_PROXY_QUIET", "true")
+	}
+
 	c.Name = ContainerName(p)
 	c.ImagePullPolicy = "IfNotPresent"
 

diff --git a/internal/workload/podspec_updates_test.go b/internal/workload/podspec_updates_test.go
@@ -666,6 +666,7 @@ func TestProxyCLIArgs(t *testing.T) {
 					},
 					MaxConnections:  ptr(int64(10)),
 					MaxSigtermDelay: ptr(int64(20)),
+					Quiet:           true,
 				},
 				Instances: []cloudsqlapi.InstanceSpec{{
 					ConnectionString: "hello:world:one",
@@ -692,6 +693,8 @@ func TestProxyCLIArgs(t *testing.T) {
 				"CSQL_PROXY_QUOTA_PROJECT":         "qp",
 				"CSQL_PROXY_MAX_CONNECTIONS":       "10",
 				"CSQL_PROXY_MAX_SIGTERM_DELAY":     "20",
+				"CSQL_PROXY_QUIET":                 "true",
+				"CSQL_PROXY_STRUCTURED_LOGS":       "true",
 			},
 		},
 		{