fixup! 76906cd

movetokube · Sep 5, 2023 · 957d59c · 957d59c
1 parent baa3c49
commit 957d59c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/api/v1alpha1/postgres_types.go b/api/v1alpha1/postgres_types.go
@@ -41,7 +41,7 @@ type PostgresSpec struct {
 // +kubebuilder:pruning:PreserveUnknownFields
 type PostgresStatus struct {
 	Succeeded bool `json:"succeeded"`
-	// name of the created db, including a prefix if configured
+	// name of the created db
 	DbName string        `json:"dbname"`
 	Roles  PostgresRoles `json:"roles"`
 	// +optional

diff --git a/charts/ext-postgres-operator/crds/db.movetokube.com_postgres_crd.yaml b/charts/ext-postgres-operator/crds/db.movetokube.com_postgres_crd.yaml
@@ -57,7 +57,7 @@ spec:
             description: PostgresStatus defines the observed state of Postgres
             properties:
               dbname:
-                description: name of the created db, including a prefix if configured
+                description: name of the created db
                 type: string
               extensions:
                 items:

diff --git a/charts/ext-postgres-operator/templates/operator.yaml b/charts/ext-postgres-operator/templates/operator.yaml
@@ -45,10 +45,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
-          {{- if .Values.prefix }}
-            - name: POSTGRES_OBJECT_PREFIX
-              value: {{ .Values.prefix }}
-          {{- end }}
             - name: OPERATOR_NAME
               value: {{ include "chart.fullname" . }}
             {{- range $key, $value := .Values.env }}

diff --git a/config/crd/bases/db.movetokube.com_postgres.yaml b/config/crd/bases/db.movetokube.com_postgres.yaml
@@ -57,7 +57,7 @@ spec:
             description: PostgresStatus defines the observed state of Postgres
             properties:
               dbname:
-                description: name of the created db, including a prefix if configured
+                description: name of the created db
                 type: string
               extensions:
                 items:

diff --git a/internal/utils/config.go b/internal/utils/config.go
@@ -30,7 +30,7 @@ func GetConfig() *Cfg {
 			PostgresDefaultDb: os.Getenv("POSTGRES_DEFAULT_DATABASE"),
 			CloudProvider:     os.Getenv("POSTGRES_CLOUD_PROVIDER"),
 			AnnotationFilter:  os.Getenv("POSTGRES_INSTANCE"),
-			ObjectPrefix:      os.Getenv("POSTGRES_OBJECT_PREFIX"),
+			ObjectPrefix:      "",
 		}
 	})
 	return config