[Fixes

zalf-rdm · Feb 27, 2024 · c27ef09 · c27ef09
1 parent 0a3f9c7
commit c27ef09
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/charts/geonode/templates/postgres/postgres-external-geodata-secrets.yaml b/charts/geonode/templates/postgres/postgres-external-geodata-secrets.yaml
@@ -6,10 +6,5 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
-<<<<<<< HEAD
-  username: {{ .Values.postgres.geodata_databasename_and_username | b64enc }}
-  password: {{ .Values.postgres.external_postgres.secret.geodata_password | b64enc }}
-=======
   geodata_password: {{ .Values.postgres.external_postgres.secret.geodata_password | b64enc }}
->>>>>>> c3d30d13231a852d96e84a856125ae9a22926b78
 {{ end }}
diff --git a/charts/geonode/templates/postgres/postgres-external-geonode-secrets.yaml b/charts/geonode/templates/postgres/postgres-external-geonode-secrets.yaml
@@ -6,10 +6,5 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
-<<<<<<< HEAD
-  username: {{ .Values.postgres.geonode_databasename_and_username | b64enc }}
-  password: {{ .Values.postgres.external_postgres.secret.geonode_password | b64enc }}
-=======
   geonode_password: {{ .Values.postgres.external_postgres.secret.geonode_password | b64enc }}
->>>>>>> c3d30d13231a852d96e84a856125ae9a22926b78
 {{ end }}