From e1bb79c133d982077d72d0dd2139908629a99e68 Mon Sep 17 00:00:00 2001 From: ellamartirosyan Date: Thu, 4 Apr 2024 13:42:10 +0300 Subject: [PATCH 1/2] chore: fix configmap for dem umbrella --- helm/dem/templates/configmap.yaml | 6 +++-- helm/dem/templates/deployment.yaml | 13 +++++----- helm/dem/templates/envoy-configmap.yaml | 4 ++- helm/dem/templates/nginx-configmap.yaml | 7 ++--- helm/dem/templates/nginx-deployment.yaml | 33 ++++++++++++------------ 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/helm/dem/templates/configmap.yaml b/helm/dem/templates/configmap.yaml index 3c8b47317..5df340efd 100644 --- a/helm/dem/templates/configmap.yaml +++ b/helm/dem/templates/configmap.yaml @@ -1,10 +1,12 @@ +{{- if .Values.enabled -}} +{{- $releaseName := .Release.Name -}} +{{- $chartName := include "pycsw.name" . -}} {{- $tracingUrl := include "pycsw.tracingUrl" . -}} {{- $metricsUrl := include "pycsw.metricsUrl" . -}} -{{- if .Values.enabled -}} apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Release.Name }}-configmap + name: {{ $releaseName }}-{{ $chartName }}-configmap data: {{ if .Values.env.tracing.enabled }} TELEMETRY_TRACING_ENABLED: 'true' diff --git a/helm/dem/templates/deployment.yaml b/helm/dem/templates/deployment.yaml index be0fd2632..5b519986b 100644 --- a/helm/dem/templates/deployment.yaml +++ b/helm/dem/templates/deployment.yaml @@ -1,14 +1,13 @@ +{{- if .Values.enabled -}} {{- $releaseName := .Release.Name -}} {{- $chartName := include "pycsw.name" . -}} +{{- $imageTag := include "pycsw.tag" . -}} {{- $cloudProviderFlavor := include "pycsw.cloudProviderFlavor" . -}} {{- $cloudProviderDockerRegistryUrl := include "pycsw.cloudProviderDockerRegistryUrl" . -}} {{- $cloudProviderImagePullSecretName := include "pycsw.cloudProviderImagePullSecretName" . -}} {{ $caSecretName := ternary .Values.authentication.ca.externalSecretName (printf "%s%s" .Release.Name "-root-ca") .Values.authentication.ca.useExternal }} {{ $sslSecretName := ternary .Values.authentication.ssl.externalSecretName (printf "%s%s" .Release.Name "-open-ssl") .Values.authentication.ssl.useExternal }} {{ $postgresSecretName := ternary .Values.authentication.db.externalSecretName (printf "%s%s" .Release.Name "-postgres-secret") .Values.authentication.db.useExternal }} -{{- $imageTag := include "pycsw.tag" . -}} - -{{- if .Values.enabled -}} {{- if .Values.authentication.ca.enabled }} {{- if and .Values.authentication.ca.useExternal (not .Values.authentication.ca.externalSecretName) }} @@ -145,7 +144,7 @@ spec: value: key.pem envFrom: - configMapRef: - name: {{ $releaseName }}-configmap + name: {{ $releaseName }}-{{ $chartName }}-configmap ports: - name: http containerPort: {{ .Values.env.targetPort }} @@ -184,19 +183,19 @@ spec: {{- end }} - name: pyscw-config configMap: - name: {{ $releaseName }}-configmap + name: {{ $releaseName }}-{{ $chartName }}-configmap items: - key: "pycsw.cfg" path: "pycsw.cfg" - name: pyscw-mappings configMap: - name: {{ $releaseName }}-configmap + name: {{ $releaseName }}-{{ $chartName }}-configmap items: - key: "mappings.py" path: "mappings.py" - name: uwsgi-config configMap: - name: {{ $releaseName }}-configmap + name: {{ $releaseName }}-{{ $chartName }}-configmap items: - key: "uwsgi.ini" path: "uwsgi.ini" diff --git a/helm/dem/templates/envoy-configmap.yaml b/helm/dem/templates/envoy-configmap.yaml index 5556d4ba1..47eb4161d 100644 --- a/helm/dem/templates/envoy-configmap.yaml +++ b/helm/dem/templates/envoy-configmap.yaml @@ -1,8 +1,10 @@ {{- if .Values.authentication.opa.enabled }} +{{- $releaseName := .Release.Name -}} +{{- $chartName := include "pycsw.name" . -}} kind: ConfigMap apiVersion: v1 metadata: - name: {{ .Release.Name }}-envoy + name: {{ $releaseName }}-{{ $chartName }}-envoy-configmap data: envoy.yaml: |- {{ tpl (.Files.Get "config/envoy.yaml") . | indent 4 }} diff --git a/helm/dem/templates/nginx-configmap.yaml b/helm/dem/templates/nginx-configmap.yaml index 19f9f31f1..6ae2fc0f8 100644 --- a/helm/dem/templates/nginx-configmap.yaml +++ b/helm/dem/templates/nginx-configmap.yaml @@ -1,14 +1,15 @@ {{- if .Values.nginx.enabled -}} +{{- $releaseName := .Release.Name -}} {{- $chartName := include "pycsw.name" . -}} apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Release.Name }}-nginx-configmap + name: {{ $releaseName }}-{{ $chartName }}-nginx-configmap labels: - app: {{ .Release.Name }}-{{ $chartName }} + app: {{ $releaseName }}-{{ $chartName }} component: nginx-configmap environment: {{ .Values.environment }} - release: {{ .Release.Name }} + release: {{ $releaseName }} data: jwt.js: {{ .Files.Get "config/jwt.js" | quote }} log_format.conf: {{ tpl (.Files.Get "config/log_format.conf") . | quote }} diff --git a/helm/dem/templates/nginx-deployment.yaml b/helm/dem/templates/nginx-deployment.yaml index 6095aab7e..80a10249b 100644 --- a/helm/dem/templates/nginx-deployment.yaml +++ b/helm/dem/templates/nginx-deployment.yaml @@ -1,33 +1,34 @@ {{- if .Values.nginx.enabled -}} +{{- $releaseName := .Release.Name -}} {{- $chartName := include "pycsw.name" . -}} {{- $cloudProviderDockerRegistryUrl := include "pycsw.cloudProviderDockerRegistryUrl" . -}} {{- $cloudProviderImagePullSecretName := include "pycsw.cloudProviderImagePullSecretName" . -}} apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Release.Name }}-nginx-deployment + name: {{ $releaseName }}-nginx-deployment {{- with .Values.annotations }} annotations: {{ toYaml . | indent 4 }} {{- end }} labels: - app: {{ .Release.Name }}-{{ $chartName }} + app: {{ $releaseName }}-{{ $chartName }} component: nginx-deployment environment: {{ .Values.environment }} - release: {{ .Release.Name }} + release: {{ $releaseName }} spec: replicas: {{ .Values.nginx.replicaCount }} selector: matchLabels: - app: {{ .Release.Name }}-{{ $chartName }} - release: {{ .Release.Name }} - run: {{ .Release.Name }}-nginx + app: {{ $releaseName }}-{{ $chartName }} + release: {{ $releaseName }} + run: {{ $releaseName }}-nginx template: metadata: labels: - app: {{ .Release.Name }}-{{ $chartName }} - release: {{ .Release.Name }} - run: {{ .Release.Name }}-nginx + app: {{ $releaseName }}-{{ $chartName }} + release: {{ $releaseName }} + run: {{ $releaseName }}-nginx # Autodiscover annotations should be here # https://github.com/elastic/beats/issues/7914 annotations: @@ -48,35 +49,35 @@ spec: {{- if .Values.authentication.opa.enabled }} - name: opa-policy secret: - secretName: {{ .Release.Name }}-opa + secretName: {{ $releaseName }}-opa - name: proxy-config configMap: - name: {{ .Release.Name }}-envoy + name: {{ $releaseName }}-{{ $chartName }}-envoy-configmap - name: jwt-public-keys secret: secretName: {{ .Values.authentication.jwtPublicKeySecretName }} {{- end }} - name: jwt-js configMap: - name: {{ .Release.Name }}-nginx-configmap + name: {{ $releaseName }}-{{ $chartName }}-nginx-configmap items: - key: jwt.js path: jwt.js - name: log-format configMap: - name: {{ .Release.Name }}-nginx-configmap + name: {{ $releaseName }}-{{ $chartName }}-nginx-configmap items: - key: log_format.conf path: log_format.conf - name: nginx-custom-conf configMap: - name: {{ .Release.Name }}-nginx-configmap + name: {{ $releaseName }}-{{ $chartName }}-nginx-configmap items: - key: default.conf path: default.conf - name: nginx-root-conf configMap: - name: {{ .Release.Name }}-nginx-configmap + name: {{ $releaseName }}-{{ $chartName }}-nginx-configmap items: - key: nginx.conf path: nginx.conf @@ -89,7 +90,7 @@ spec: {{- end }} containers: ## Nginx Deployment - - name: {{ .Release.Name }}-nginx + - name: {{ $releaseName }}-nginx {{- with .Values.nginx.image }} image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ .tag }} {{- end }} From 5ae8ae8c2d22cf2325ca00769cfbb5800a2c48e8 Mon Sep 17 00:00:00 2001 From: ellamartirosyan Date: Wed, 10 Apr 2024 18:06:23 +0300 Subject: [PATCH 2/2] chore: fix configmap for dem umbrella --- helm/dem/config/default.conf | 2 -- helm/dem/templates/_helpers.tpl | 12 ++++----- helm/dem/templates/configmap.yaml | 2 +- helm/dem/templates/deployment.yaml | 32 ++++++++++++------------ helm/dem/templates/ingress.yaml | 5 ++-- helm/dem/templates/nginx-configmap.yaml | 2 +- helm/dem/templates/nginx-deployment.yaml | 8 +++--- helm/dem/templates/nginx-service.yaml | 10 ++++---- helm/dem/templates/opa-secret.yaml | 4 ++- helm/dem/templates/route.yaml | 9 ++++--- helm/dem/templates/service.yaml | 4 +-- helm/dem/values.yaml | 29 ++++++++++++--------- 12 files changed, 63 insertions(+), 56 deletions(-) diff --git a/helm/dem/config/default.conf b/helm/dem/config/default.conf index 25b0191d4..e59b018ab 100644 --- a/helm/dem/config/default.conf +++ b/helm/dem/config/default.conf @@ -1,7 +1,5 @@ -{{- $chartName := include "pycsw.name" . -}} {{- $serviceName := include "service.fullname" . -}} -{{- $releaseName := .Release.Name -}} map $msec $nanosec { "~*(\d{10})\.(\d{3})" "$1$2000000"; diff --git a/helm/dem/templates/_helpers.tpl b/helm/dem/templates/_helpers.tpl index 3b920be11..189cc3cb9 100644 --- a/helm/dem/templates/_helpers.tpl +++ b/helm/dem/templates/_helpers.tpl @@ -30,7 +30,7 @@ Create chart name and version as used by the chart label. Create service name as used by the service name label. */}} {{- define "service.fullname" -}} -{{- printf "%s-%s" .Release.Name "service" }} +{{- printf "%s-%s" .Release.Name .Chart.Name }} {{- end }} {{/* @@ -131,19 +131,19 @@ Returns the tracing url from global if exists or from the chart's values {{- define "pycsw-pg-connection-string" -}} {{- "postgresql://${DB_USER}" -}} -{{- if .Values.authentication.db.requirePassword -}} +{{- if .Values.db.user.requirePassword -}} {{- ":${DB_PASSWORD}" -}} {{- end -}} {{- "@${DB_HOST}:${DB_PORT}/${DB_NAME}" -}} -{{- if .Values.authentication.db.sslEnabled -}} +{{- if .Values.db.ssl.enabled -}} {{- "?sslmode=require" -}} -{{- if .Values.authentication.db.caFileKey -}} +{{- if .Values.db.ssl.caFileName -}} {{- "&sslrootcert=" -}}/.postgresql/ca.pem {{- end -}} -{{- if .Values.authentication.db.certFileKey -}} +{{- if .Values.db.ssl.certFileName -}} {{- "&sslcert=" -}}/.postgresql/cert.pem {{- end -}} -{{- if .Values.authentication.db.keyFileKey -}} +{{- if .Values.db.ssl.keyFileName -}} {{- "&sslkey=" -}}/.postgresql/key.pem {{- end -}} {{- end -}} diff --git a/helm/dem/templates/configmap.yaml b/helm/dem/templates/configmap.yaml index 5df340efd..87242660a 100644 --- a/helm/dem/templates/configmap.yaml +++ b/helm/dem/templates/configmap.yaml @@ -30,6 +30,6 @@ data: DB_HOST: {{ quote .Values.db.host }} DB_PORT: {{ quote .Values.db.port }} DB_NAME: {{ quote .Values.db.name }} - POSTGRES_ENABLE_SSL_AUTH: {{ quote .Values.authentication.db.sslEnabled }} + POSTGRES_ENABLE_SSL_AUTH: {{ quote .Values.db.ssl.enabled }} DB_SCHEMA: {{ quote .Values.db.schema }} {{- end }} diff --git a/helm/dem/templates/deployment.yaml b/helm/dem/templates/deployment.yaml index 5b519986b..ed8155daa 100644 --- a/helm/dem/templates/deployment.yaml +++ b/helm/dem/templates/deployment.yaml @@ -7,7 +7,7 @@ {{- $cloudProviderImagePullSecretName := include "pycsw.cloudProviderImagePullSecretName" . -}} {{ $caSecretName := ternary .Values.authentication.ca.externalSecretName (printf "%s%s" .Release.Name "-root-ca") .Values.authentication.ca.useExternal }} {{ $sslSecretName := ternary .Values.authentication.ssl.externalSecretName (printf "%s%s" .Release.Name "-open-ssl") .Values.authentication.ssl.useExternal }} -{{ $postgresSecretName := ternary .Values.authentication.db.externalSecretName (printf "%s%s" .Release.Name "-postgres-secret") .Values.authentication.db.useExternal }} +{{ $postgresSecretName := ternary .Values.db.user.secretName (printf "%s%s" .Release.Name "-postgres-secret") .Values.db.user.useExternal }} {{- if .Values.authentication.ca.enabled }} {{- if and .Values.authentication.ca.useExternal (not .Values.authentication.ca.externalSecretName) }} @@ -24,7 +24,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ $releaseName }}-deployment + name: {{ $releaseName }}-{{ $chartName }} labels: app: {{ $chartName }} component: {{ $chartName }} @@ -60,7 +60,7 @@ spec: - name: {{ $cloudProviderImagePullSecretName | quote }} {{- end }} containers: - - name: {{ $releaseName }} + - name: {{ $chartName }} {{- with .Values.image }} image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ $imageTag }} {{- end }} @@ -88,18 +88,18 @@ spec: - mountPath: "/pycsw/uwsgi.ini" name: uwsgi-config subPath: uwsgi.ini - {{- if .Values.authentication.db.sslEnabled }} - {{- if .Values.authentication.db.caFileKey }} + {{- if .Values.db.ssl.enabled }} + {{- if .Values.db.ssl.caFileName }} - name: ca-file - mountPath: /certs/ca.crt + mountPath: /certs/ca.pem subPath: ca.pem {{- end }} - {{- if .Values.authentication.db.keyFileKey }} + {{- if .Values.db.ssl.keyFileName }} - name: key-file mountPath: /certs/key.pem subPath: key.pem {{- end }} - {{- if .Values.authentication.db.certFileKey }} + {{- if .Values.db.ssl.certFileName }} - name: cert-file mountPath: /certs/cert.pem subPath: cert.pem @@ -129,7 +129,7 @@ spec: secretKeyRef: name: {{ $postgresSecretName }} key: username - {{- if .Values.authentication.db.requirePassword }} + {{- if .Values.db.user.requirePassword }} - name: DB_PASSWORD valueFrom: secretKeyRef: @@ -206,29 +206,29 @@ spec: configMap: name: filebeat-config {{- end }} - {{- if .Values.authentication.db.sslEnabled }} - {{- if .Values.authentication.db.caFileKey }} + {{- if .Values.db.ssl.enabled }} + {{- if .Values.db.ssl.caFileName }} - name: ca-file secret: secretName: {{ $postgresSecretName }} items: - - key: {{ .Values.authentication.db.caFileKey }} + - key: {{ .Values.db.ssl.caFileName }} path: ca.pem {{- end }} - {{- if .Values.authentication.db.keyFileKey }} + {{- if .Values.db.ssl.keyFileName }} - name: key-file secret: secretName: {{ $postgresSecretName }} items: - - key: {{ .Values.authentication.db.keyFileKey }} + - key: {{ .Values.db.ssl.keyFileName }} path: key.pem {{- end }} - {{- if .Values.authentication.db.certFileKey }} + {{- if .Values.db.ssl.certFileName }} - name: cert-file secret: secretName: {{ $postgresSecretName }} items: - - key: {{ .Values.authentication.db.certFileKey }} + - key: {{ .Values.db.ssl.certFileName }} path: cert.pem {{- end }} {{- end }} diff --git a/helm/dem/templates/ingress.yaml b/helm/dem/templates/ingress.yaml index c2afa8185..de2a1705d 100644 --- a/helm/dem/templates/ingress.yaml +++ b/helm/dem/templates/ingress.yaml @@ -1,10 +1,11 @@ +{{- if and (.Values.enabled) (.Values.ingress.enabled) -}} {{- $releaseName := .Release.Name -}} +{{- $chartName := include "pycsw.name" . -}} {{- $serviceName := include "service.fullname" . -}} -{{- if and (.Values.enabled) (.Values.ingress.enabled) -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ $releaseName }}-nginx-ingress + name: {{ $releaseName }}-{{ $chartName }}-nginx annotations: kubernetes.io/ingress.class: "nginx" {{- if eq .Values.ingress.type "nginx-org" }} diff --git a/helm/dem/templates/nginx-configmap.yaml b/helm/dem/templates/nginx-configmap.yaml index 6ae2fc0f8..9a8e47a47 100644 --- a/helm/dem/templates/nginx-configmap.yaml +++ b/helm/dem/templates/nginx-configmap.yaml @@ -8,7 +8,7 @@ metadata: labels: app: {{ $releaseName }}-{{ $chartName }} component: nginx-configmap - environment: {{ .Values.environment }} + environment: {{ include "pycsw.environment" . }} release: {{ $releaseName }} data: jwt.js: {{ .Files.Get "config/jwt.js" | quote }} diff --git a/helm/dem/templates/nginx-deployment.yaml b/helm/dem/templates/nginx-deployment.yaml index 80a10249b..29580f227 100644 --- a/helm/dem/templates/nginx-deployment.yaml +++ b/helm/dem/templates/nginx-deployment.yaml @@ -6,7 +6,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ $releaseName }}-nginx-deployment + name: {{ $releaseName }}-{{ $chartName }}-nginx {{- with .Values.annotations }} annotations: {{ toYaml . | indent 4 }} @@ -14,7 +14,7 @@ metadata: labels: app: {{ $releaseName }}-{{ $chartName }} component: nginx-deployment - environment: {{ .Values.environment }} + environment: {{ include "pycsw.environment" . }} release: {{ $releaseName }} spec: replicas: {{ .Values.nginx.replicaCount }} @@ -49,7 +49,7 @@ spec: {{- if .Values.authentication.opa.enabled }} - name: opa-policy secret: - secretName: {{ $releaseName }}-opa + secretName: {{ $releaseName }}-{{ $chartName }}-opa - name: proxy-config configMap: name: {{ $releaseName }}-{{ $chartName }}-envoy-configmap @@ -90,7 +90,7 @@ spec: {{- end }} containers: ## Nginx Deployment - - name: {{ $releaseName }}-nginx + - name: {{ $chartName }}-nginx {{- with .Values.nginx.image }} image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ .tag }} {{- end }} diff --git a/helm/dem/templates/nginx-service.yaml b/helm/dem/templates/nginx-service.yaml index 1cf953c84..8f9a6bdc9 100644 --- a/helm/dem/templates/nginx-service.yaml +++ b/helm/dem/templates/nginx-service.yaml @@ -11,9 +11,9 @@ metadata: name: {{ $serviceName }}-nginx labels: app: {{ $releaseName }}-{{ $chartName }} - component: nginx-service - environment: {{ .Values.environment }} - release: {{ .Release.Name }} + component: {{ $chartName }}-nginx-service + environment: {{ include "pycsw.environment" . }} + release: {{ $releaseName }} spec: # In case cloudProavider=azure {{- if eq $cloudProviderFlavor "azure" }} @@ -39,6 +39,6 @@ spec: {{- end }} selector: app: {{ $releaseName }}-{{ $chartName }} - release: {{ .Release.Name }} - run: {{ .Release.Name }}-nginx + release: {{ $releaseName }} + run: {{ $releaseName }}-nginx {{- end }} diff --git a/helm/dem/templates/opa-secret.yaml b/helm/dem/templates/opa-secret.yaml index f533f0ef4..d8b156b7a 100644 --- a/helm/dem/templates/opa-secret.yaml +++ b/helm/dem/templates/opa-secret.yaml @@ -1,8 +1,10 @@ {{- if .Values.authentication.opa.enabled }} +{{- $releaseName := .Release.Name -}} +{{- $chartName := include "pycsw.name" . -}} kind: Secret apiVersion: v1 metadata: - name: {{ .Release.Name }}-opa + name: {{ $releaseName }}-{{ $chartName }}-opa data: policy.rego: |- {{ tpl (.Files.Get "config/policy.rego") . | b64enc | indent 4 }} diff --git a/helm/dem/templates/route.yaml b/helm/dem/templates/route.yaml index 4f3a7f354..bdb0c2e12 100644 --- a/helm/dem/templates/route.yaml +++ b/helm/dem/templates/route.yaml @@ -1,12 +1,13 @@ -{{- $releaseName := .Release.Name -}} {{- $cloudProviderFlavor := include "pycsw.cloudProviderFlavor" . -}} -{{ $targetPort := ternary "external" "internal" .Values.authentication.opa.enabled }} -{{- $serviceName := include "service.fullname" . -}} {{- if and (and (.Values.enabled) (eq $cloudProviderFlavor "openshift")) (.Values.route.enabled) -}} +{{- $releaseName := .Release.Name -}} +{{- $chartName := include "pycsw.name" . -}} +{{- $serviceName := include "service.fullname" . -}} +{{ $targetPort := ternary "external" "internal" .Values.authentication.opa.enabled }} apiVersion: route.openshift.io/v1 kind: Route metadata: - name: {{ $releaseName }}-nginx-route + name: {{ $releaseName }}-{{ $chartName }}-nginx annotations: haproxy.router.openshift.io/rewrite-target: / {{- if .Values.route.timeout.enabled }} diff --git a/helm/dem/templates/service.yaml b/helm/dem/templates/service.yaml index 1640f72c1..49879da2a 100644 --- a/helm/dem/templates/service.yaml +++ b/helm/dem/templates/service.yaml @@ -1,8 +1,8 @@ +{{- if .Values.enabled -}} {{- $releaseName := .Release.Name -}} {{- $chartName := include "pycsw.name" . -}} -{{- $cloudProviderFlavor := include "pycsw.cloudProviderFlavor" . -}} {{- $serviceName := include "service.fullname" . -}} -{{- if .Values.enabled -}} +{{- $cloudProviderFlavor := include "pycsw.cloudProviderFlavor" . -}} apiVersion: v1 kind: Service metadata: diff --git a/helm/dem/values.yaml b/helm/dem/values.yaml index 29586ef70..81ff5608c 100644 --- a/helm/dem/values.yaml +++ b/helm/dem/values.yaml @@ -35,14 +35,25 @@ authentication: enabled: true allowedOrigin: '*' allowedHeaders: '' - db: +db: + host: 10.0.4.4 + port: 5432 + schema: public + name: dem-catalog-manager-dev + user: requirePassword: true + rejectUnauthorized: true + useExternal: true + secretName: pycsw-postgres-secret + username: + password: + ssl: + enabled: false useExternal: true - externalSecretName: pycsw-postgres-secret - sslEnabled: false - caFileKey: caFile - certFileKey: certFile - keyFileKey: keyFile + secretName: pycsw-postgres-secret + caFileName: caFile + certFileName: certFile + keyFileName: keyFile image: repository: pycsw @@ -74,12 +85,6 @@ env: enabled: false url: http://localhost:55681/v1/metrics -db: - host: 10.0.4.4 - name: dem-catalog-manager-int - schema: public - port: 5432 - resources: enabled: true value: