feat: add quitquitquit endpoint for cloud-sql-proxy to allow for clea…

…n termination of the sidecar
nais · Feb 6, 2024 · be8fe03 · be8fe03
1 parent 2438b6f
commit be8fe03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/resourcecreator/google/helpers.go b/pkg/resourcecreator/google/helpers.go
@@ -40,6 +40,7 @@ func CloudSqlProxyContainer(port int32, googleCloudSQLProxyContainerImage, proje
 			"/cloud-sql-proxy",
 			"--max-sigterm-delay", CloudSQLProxyTermTimeout,
 			"--port", strconv.Itoa(int(port)),
+			"--quitquitquit",
 			connectionName,
 		},
 		Resources: pod.ResourceLimits(cloudSqlProxyContainerResourceSpec),

diff --git a/pkg/synchronizer/synchronizer_test.go b/pkg/synchronizer/synchronizer_test.go
@@ -496,7 +496,7 @@ func TestSynchronizerResourceOptions(t *testing.T) {
 	err = rig.client.Get(ctx, req.NamespacedName, deploy)
 	assert.NoError(t, err)
 	expectedInstanceName := fmt.Sprintf("%s:%s:%s", testProjectId, google.Region, app.Name)
-	assert.Equal(t, expectedInstanceName, deploy.Spec.Template.Spec.Containers[1].Command[5])
+	assert.Equal(t, expectedInstanceName, deploy.Spec.Template.Spec.Containers[1].Command[6])
 
 	err = rig.client.Get(ctx, req.NamespacedName, sqlinstance)
 	assert.NoError(t, err)