From be8fe0379e3266f0cc6be3df9f8236b152df38d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sten=20R=C3=B8kke?= Date: Tue, 6 Feb 2024 22:11:48 +0100 Subject: [PATCH] feat: add quitquitquit endpoint for cloud-sql-proxy to allow for clean termination of the sidecar --- pkg/resourcecreator/google/helpers.go | 1 + pkg/synchronizer/synchronizer_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/resourcecreator/google/helpers.go b/pkg/resourcecreator/google/helpers.go index a670f716..1f6ba237 100644 --- 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 index bb5dd954..f5af61da 100644 --- 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)