fix for janus-idp/operator#51

gazarenkov · Nov 30, 2023 · 47ba2f9 · 47ba2f9
1 parent 2bf0716
commit 47ba2f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/config/manager/default-config/db-service.yaml b/config/manager/default-config/db-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: backstage-psql-cr1 # placeholder for 'backstage-psql-<cr-name>'
+  name: backstage-psql # placeholder for 'backstage-psql-<cr-name>' .NOTE: For the time it is static and linked to Secret-> postgres-secrets -> OSTGRES_HOST
 spec:
   selector:
     backstage.io/app:  backstage-psql-cr1 # placeholder for 'backstage-psql-<cr-name>'

diff --git a/controllers/local_db_statefulset.go b/controllers/local_db_statefulset.go
@@ -190,13 +190,14 @@ func (r *BackstageReconciler) applyLocalDbStatefulSet(ctx context.Context, backs
 }
 
 func (r *BackstageReconciler) applyLocalDbServices(ctx context.Context, backstage bs.Backstage, ns string) error {
-	name := fmt.Sprintf("backstage-psql-%s", backstage.Name)
-	err := r.applyPsqlService(ctx, backstage, name, name, ns, "db-service.yaml")
+	// TODO static for the time and bound to Secret: postgres-secret
+	label := fmt.Sprintf("backstage-psql-%s", backstage.Name)
+	err := r.applyPsqlService(ctx, backstage, "backstage-psql", label, ns, "db-service.yaml")
 	if err != nil {
 		return err
 	}
 	nameHL := fmt.Sprintf("backstage-psql-%s-hl", backstage.Name)
-	return r.applyPsqlService(ctx, backstage, nameHL, name, ns, "db-service-hl.yaml")
+	return r.applyPsqlService(ctx, backstage, nameHL, label, ns, "db-service-hl.yaml")
 
 }
 

diff --git a/examples/postgres-secret.yaml b/examples/postgres-secret.yaml
@@ -8,4 +8,5 @@ stringData:
   POSTGRES_PASSWORD: admin123
   POSTGRES_PORT: "5432"
   POSTGRES_USER: postgres
-  POSTGRESQL_ADMIN_PASSWORD: admin123
+  POSTGRESQL_ADMIN_PASSWORD: admin123
+  POSTGRES_HOST: backstage-psql