fix chart templates

Signed-off-by: PatStLouis <[email protected]>

charts/Chart.yaml

@@ -1,17 +1,9 @@
 apiVersion: v2
 name: trustdidweb-server-py
+icon: https://identity.foundation/trustdidweb/tdw.jpg
 description: An api server to register and serve trusted web dids.
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: 0.0.2
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
 appVersion: "v0.0.2"
 
 dependencies:

charts/my-values.yaml

@@ -0,0 +1,16 @@
+---
+server:
+  image:
+    tag: 0.0.4
+
+  host: "tdw.dev.opsec.id"
+
+  environment:
+    DOMAIN: "tdw.dev.opsec.id"
+    SECRET_KEY: "fdsfdsfgdsf43tr"
+    ENDORSER_MULTIKEY: "z6Mkiw1uyDmZ2cX872XhziSNm47Z3WV9EZqgqEH6grrLbSZ6"
+
+
+postgresql:
+  auth:
+    postgresPassword: postgres

charts/templates/server/deployment.yaml

@@ -27,21 +27,20 @@ spec:
             {{- toYaml .Values.server.containerSecurityContext | nindent 12 }}
           image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}"
           imagePullPolicy: {{ .Values.server.image.pullPolicy }}
-          envFrom:
-            - secretRef:
-                name: {{ include "server.fullname" . }}-env
           env:
             - name: DOMAIN
               value: {{ .Values.server.host }}
             - name: ENDORSER_MULTIKEY
               value: {{ .Values.server.environment.ENDORSER_MULTIKEY }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: trustdidweb-server-py-postgresql
-                  key: password
-            - name: POSTGRES_URI
-              value: postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ include "global.postgresql.fullname" . }}:{{ .Values.postgresql.primary.service.ports.postgresql }}
+            - name: SECRET_KEY
+              value: {{ .Values.server.environment.SECRET_KEY }}
+            # - name: POSTGRES_PASSWORD
+            #   valueFrom:
+            #     secretKeyRef:
+            #       name: trustdidweb-server-py-postgresql
+            #       key: password
+            # - name: POSTGRES_URI
+            #   value: postgres://{{ .Values.postgresql.auth.username }}:$(POSTGRES_PASSWORD)@{{ include "global.postgresql.fullname" . }}:{{ .Values.postgresql.primary.service.ports.postgresql }}
           ports:
             - name: api
               containerPort: {{ .Values.server.service.apiPort }}

charts/templates/server/ingress.yaml

@@ -3,10 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "server.fullname" . }}
-  annotations:
-    {{- toYaml .Values.ingress.annotations | nindent 4 }}
   labels:
-    {{- toYaml .Values.ingress.labels | nindent 4 }}
     {{- include "server.labels" . | nindent 4 }}
 spec:
   tls:

charts/values.yaml

@@ -7,10 +7,10 @@ selectorLabels: {}
 
 server:
   image:
-    repository: ghcr.io/OpSecId/trustdidweb-server-py
+    repository: ghcr.io/decentralized-identity/trustdidweb-server-py
     pullPolicy: IfNotPresent
     pullSecrets: []
-    tag: 0.1.0
+    tag: 0.0.4
 
   host: ""
 
@@ -39,6 +39,7 @@ server:
 
   environment:
     DOMAIN: ""
+    SECRET_KEY: ""
     ENDORSER_MULTIKEY: ""
 
 postgresql:

server/config.py

@@ -17,7 +17,7 @@ class Settings(BaseSettings):
     ENDORSER_MULTIKEY: str = os.environ["ENDORSER_MULTIKEY"]
 
     ASKAR_DB: str = (
-        os.environ["POSTGRES_URI"]
+        os.environ["POSTGRES_URI"]+'/tdw-server'
         if "POSTGRES_URI" in os.environ
         else "sqlite://app.db"
     )