first version of pg_featureserv stack

charts/pgfeatureserv/templates/deployment.yaml

@@ -33,47 +33,67 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+
           ports:
             - name: http
               containerPort: 9000
               protocol: TCP
+
           env:
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: "{{- printf "%s" (tpl .Values.db.pwdSecret $) -}}"
-                  key: "{{ .Values.db.pwdKey }}"
-
+                  name: {{ tpl (.Values.db.pwdSecret) . }}
+                  key: {{ .Values.db.pwdKey }}
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: "{{- printf "%s" (tpl .Values.db.pwdSecret $) -}}"
-                  key: "{{ .Values.redis.pwdKey }}"
-
+                  name: {{ tpl (.Values.db.pwdSecret) . }}
+                  key: {{ .Values.redis.pwdKey }}
             - name: CACHE
               value: 'Naive'
-
             - name: POSTGRES_DB
-              value: "{{- printf "%s" (tpl .Values.db.name $) -}}"
-
+              value: {{ tpl (.Values.db.name) . }}
             - name: POSTGRES_HOST
-              value: "{{- printf "%s" (tpl .Values.db.host $) -}}"
-
+              value: {{ tpl (.Values.db.host) . }}
             - name: REDIS_URL
-              value: "{{- printf "%s" (tpl .Values.redis.host $) -}}:{{ .Values.redis.port }}"
-
+              value: "{{ tpl (.Values.redis.host) . }}:{{ .Values.redis.port }}"
             - name: DATABASE_URL
               value: "postgres://{{ .Values.db.username }}:$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):{{ .Values.db.port }}/$(POSTGRES_DB)"
+
           livenessProbe:
             httpGet:
               path: /
               port: http
+
           readinessProbe:
             httpGet:
               path: /
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+
+      # initContainers:
+      #   - name: pg-injector
+      #     image: registry.gpf-tech.ign.fr/geoplateforme/datasets/gpf-postgresql-injector/gpf-postgresql-injector:latest
+      #     command:
+      #       ["/bin/sh", "-c", "zcat 09*.sql.gz | psql"]
+
+      #     env:
+      #       - name: PGHOST
+      #         value: "{{ tpl (.Values.db.host) . }}"
+      #       - name: PGPORT
+      #         value: "5432"
+      #       - name: PGDATABASE 
+      #         value: "{{ tpl (.Values.db.name) . }}"
+      #       - name: PGUSER  
+      #         value: "{{ tpl (.Values.db.username) . }}"
+      #       - name: PGPASSWORD   
+      #         valueFrom:
+      #           secretKeyRef:
+      #             name: "{{ tpl (.Values.db.pwdSecret) . }}"
+      #             key: "{{ .Values.db.pwdKey }}"
+
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}