Merge branch 'test' into 'main'

Test

See merge request !1

Chart.yaml

 apiVersion: v1
-appVersion: v0.0.6
+appVersion: v0.0.8
 description: mediator deployment
 name: mediator
-version: 0.0.2
+version: 0.1.8
 icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg"

templates/configSecret.yaml

-apiVersion: v1
-kind: Secret
-metadata:
-  name:  {{ template "app.name" . }}-config
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "app.labels" . | nindent 4 }}

templates/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "mediator"
+  name: "mediator-test"
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "app.labels" . | nindent 4 }}
@@ -37,40 +37,13 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         env:
           - name: MEDIATOR_CONTROLLER_ADMIN_API_KEY
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: MEDIATOR_CONTROLLER_ADMIN_API_KEY
+            value: {{ .Values.mediator.controller.key | quote }}
           - name: MEDIATOR_AGENT_ADMIN_API_KEY
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: MEDIATOR_AGENT_ADMIN_API_KEY
-          - name: POSTGRESQL_HOST
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: POSTGRESQL_HOST
-          - name: ACAPY_WALLET_STORAGE_CONFIG
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: ACAPY_WALLET_STORAGE_CONFIG
-          - name: ACAPY_WALLET_STORAGE_CREDS
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: ACAPY_WALLET_STORAGE_CREDS
+            value: {{ .Values.mediator.admin.key | quote }}
           - name: ACAPY_WALLET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: ACAPY_WALLET_KEY
+            value: {{ .Values.mediator.wallet.key | quote }}
           - name: MEDIATOR_AGENT_ADMIN_MODE
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: MEDIATOR_AGENT_ADMIN_MODE
+            value: {{ .Values.mediator.admin.mode | quote }}
           - name: MEDIATOR_CONTROLLER_WEBHOOK
             value: {{ .Values.mediator.controller.webhook | quote }}
           - name: MEDIATOR_AGENT_LABEL
@@ -93,8 +66,10 @@ spec:
             value: {{ .Values.mediator.wallet.name | quote }}
           - name: MEDIATOR_ARG_FILE
             value: {{ .Values.mediator.arg_file | quote }}
-          - name: POSTGRESQL_PORT
-            value: {{ .Values.mediator.postgre.port | quote }}
+          - name: DB_USER
+            value: {{ .Values.postgres.user }}
+          - name: DB_PASSWORD
+            value: {{ .Values.postgres.password }}
           
 {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 8 }}

templates/ingress.yaml

@@ -2,7 +2,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ template "app.name" . }}
+  name: "mediator-test"
   namespace: {{ .Release.Namespace }}
   annotations:
 {{ toYaml .Values.ingress.annotations | indent 4 }}
@@ -23,7 +23,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ template "app.name" . }}
+                name: caddy
                 port:
-                  number: {{ .Values.service.port }}
-{{- end }}
+                  number: 2015
+{{- end }}
\ No newline at end of file

templates/service.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "app.name" . }}
+  name: "mediator-test"
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "app.labels" . | nindent 4 }}
@@ -18,4 +18,4 @@ spec:
     port: {{ .Values.service.port2 }}
     targetPort: {{ .Values.service.port2 }}
   selector:
-    {{- include "app.selectorLabels" . | nindent 4 }}
+    {{- include "app.selectorLabels" . | nindent 4 }}
\ No newline at end of file

values.yaml

@@ -64,37 +64,39 @@ service:
   port1: 3001
   port2: 3002
 
+postgres:
+  user: "root"
+  password: "password"
+
 mediator:
   controller:
-    key: ""
+    key: "xei2QavYTUaOmeI4FOudvQXpALhDGoCA"
     webhook: http://mediator:3010/webhooks
   agent:
     key: ""
-    label: Gaiax-Mediator
+    label: Test-Mediator
     http_in_port: 3000
     ws_in_port: 3001
     http_admin_port: 3002
-    admin_mode: 
-      admin_api_key: ""
+  admin:
+    key: "Hxly1uuBXSWjSERoEkuD2amIWn7KBWxE"
+    mode: "admin-api-key 7gdmVBiJalMj52Oum50yD8neu/nxmv3/DTWcZPyKZ4K2UdNNwSPKgg=="
   alias: MOON
   log:
     level: INFO
   endpoint:
-    url: https://gaiax.vereign.com/mediator
+    url: https://gcloud-stage.vrgnservices.com/mediator
   env: local
   postgre:
-    host: ""
+    host: "35.234.125.209"
     port: 5432
   wallet:
-    storage:
-      config: ""
-      creds: ""
     name: mediator
-    key: ""
+    key: testing
   arg_file: ./configs/mediator-auto-accept.yml
 
 ingress:
   enabled: true
   tlsEnabled: true
-  frontendDomain: gaiax.vereign.com
+  frontendDomain: gcloud-stage.vrgnservices.com
   frontendTlsSecretName: cert-manager-tls