|
@@ -1,8 +1,13 @@
|
|
|
apiVersion: v1
|
|
apiVersion: v1
|
|
|
data:
|
|
data:
|
|
|
DEBUG: "False"
|
|
DEBUG: "False"
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
# SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
|
|
# SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
|
|
|
SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
|
|
SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
|
|
|
|
|
+=======
|
|
|
|
|
+ SQL_HOST: postgres-cluster-rw.reymota-pg-cluster.svc.cluster.local
|
|
|
|
|
+ # SQL_HOST: k8s-postgres-cluster-rw.k8s-pg-cluster.svc.cluster.local
|
|
|
|
|
+>>>>>>> ec98923ba03fefd2d002586f609d5217eeb7cd23
|
|
|
SQL_PORT: "5432"
|
|
SQL_PORT: "5432"
|
|
|
DATABASE: postgres
|
|
DATABASE: postgres
|
|
|
kind: ConfigMap
|
|
kind: ConfigMap
|
