Remove enabled field from cloudSqlProxy

kartverket · Aug 20, 2024 · e8d6336 · e8d6336
1 parent f23edf1
commit e8d6336
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/api/v1alpha1/podtypes/gcp.go b/api/v1alpha1/podtypes/gcp.go
@@ -34,12 +34,6 @@ type Auth struct {
 }
 
 type CloudSQLProxySettings struct {
-	// Enables the sidecar for CloudSQL proxy
-
-	//+kubebuilder:validation:Optional
-	//+kubebuilder:default:=false
-	Enabled bool `json:"enabled"`
-
 	// Connection name for the CloudSQL instance. Found in the Google Cloud Console under your CloudSQL resource.
 	// The format is "projectName:region:instanceName" E.g. "skip-prod-bda1:europe-north1:my-db".
 	//+kubebuilder:validation:Required

diff --git a/config/crd/skiperator.kartverket.no_applications.yaml b/config/crd/skiperator.kartverket.no_applications.yaml
@@ -520,9 +520,6 @@ spec:
                           The format is "projectName:region:instanceName" E.g. "skip-prod-bda1:europe-north1:my-db".
                         pattern: ^[^:]+:[^:]+:[^:]+$
                         type: string
-                      enabled:
-                        default: false
-                        type: boolean
                       ip:
                         description: The IP address of the CloudSQL instance. This
                           is used to create a serviceentry for the CloudSQL proxy.

diff --git a/config/crd/skiperator.kartverket.no_skipjobs.yaml b/config/crd/skiperator.kartverket.no_skipjobs.yaml
@@ -484,9 +484,6 @@ spec:
                               The format is "projectName:region:instanceName" E.g. "skip-prod-bda1:europe-north1:my-db".
                             pattern: ^[^:]+:[^:]+:[^:]+$
                             type: string
-                          enabled:
-                            default: false
-                            type: boolean
                           ip:
                             description: The IP address of the CloudSQL instance.
                               This is used to create a serviceentry for the CloudSQL

diff --git a/pkg/util/helperfunctions.go b/pkg/util/helperfunctions.go
@@ -149,7 +149,7 @@ func EnsurePrefix(s string, prefix string) string {
 }
 
 func IsCloudSqlProxyEnabled(gcp *podtypes.GCP) bool {
-	return gcp != nil && gcp.CloudSQLProxy != nil && gcp.CloudSQLProxy.Enabled
+	return gcp != nil && gcp.CloudSQLProxy != nil
 }
 
 func IsGCPAuthEnabled(gcp *podtypes.GCP) bool {

diff --git a/tests/application/cloudsql-auth-proxy/set-version.yaml b/tests/application/cloudsql-auth-proxy/set-version.yaml
@@ -7,7 +7,6 @@ spec:
   port: 8080
   gcp:
     cloudSqlProxy:
-      enabled: true
       connectionName: test-project-bda1:europe-north1:pg-01-test
       version: 2.8.12
       serviceAccount: [email protected]