simplify helm config

Signed-off-by: Frank Bernhardt <[email protected]>

.gitignore

@@ -80,5 +80,5 @@ package-lock.json
 # --------------------------------------
 
 charts/**/charts/
-charts/**/manifests/
 my-values.yaml
+manifests/

charts/bpa/templates/acapy_deployment.yaml

@@ -36,7 +36,7 @@ spec:
            --arg-file acapy-static-args.yml \   
            --inbound-transport http '0.0.0.0' {{ .Values.acapy.service.httpPort }} \ 
            --webhook-url http://{{ include "bpa.fullname" . }}:{{ .Values.bpa.service.port }}/log \
-           --genesis-url '{{ .Values.bpa.ledgerURL }}/genesis' \
+           --genesis-url '{{ .Values.bpa.config.ledger.browser }}/genesis' \
            --endpoint https://{{ (index .Values.acapy.ingress.hosts 0).host }} \
            --wallet-storage-type 'postgres_storage' \
            --wallet-name 'mywallet' \

charts/bpa/templates/bpa_configmap.yaml

@@ -5,6 +5,18 @@ metadata:
   labels:
     {{- include "bpa.labels" . | nindent 4 }}
 data:
-  application.yaml: |-
+  application.yaml: |-  
     bpa:           
 {{ toYaml .Values.bpa.config | indent 6 }}   
+      acapy:
+        url: http://{{ include "acapy.fullname" . }}:{{ .Values.acapy.service.adminPort }} 
+        apiKey: {{ .Values.acapy.adminURLApiKey }}
+        endpoint: https://{{ (index .Values.acapy.ingress.hosts 0).host }}  
+      pg:
+        url: jdbc:postgresql://{{ include "global.postgresql.fullname" . }}/{{ .Values.postgresql.postgresqlUsername }}
+        username: {{ .Values.postgresql.postgresqlUsername }}
+        password: $(POSTGRES_PASSWORD)
+      host: {{ (index .Values.bpa.ingress.hosts 0).host }}
+      micronaut:
+        security:
+          enabled: {{ .Values.bpa.config.security.enabled }}

charts/bpa/templates/bpa_deployment.yaml

@@ -34,42 +34,12 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          env:
-            - name: BPA_BOOTSTRAP_PW
-              value: {{ .Values.bpa.password | quote }}
-            - name: BPA_BOOTSTRAP_UN
-              value: {{ .Values.bpa.userName | quote }}   
-            - name: BPA_DID_PREFIX
-              value: {{ .Values.bpa.didPrefix | quote }}
-            - name: BPA_LEDGER_BROWSER
-              value: {{ .Values.bpa.ledgerBrowser | quote }}
-            - name: BPA_RESOLVER_URL
-              value: {{ .Values.bpa.resolverURL | quote }}
-            - name: BPA_WEB_MODE
-              value: {{ .Values.bpa.webMode | quote }}
-            - name: AGENT_NAME
-              value: {{ .Values.bpa.agentName | quote }}
-            - name: ACAPY_ENDPOINT
-              value: https://{{ (index .Values.acapy.ingress.hosts 0).host }}
-            - name: BPA_IMPRINT_URL
-              value: {{ .Values.bpa.imprintURL | quote }}
-            - name: BPA_PRIVACY_POLICY_URL
-              value: {{ .Values.bpa.privacyPolicyURL | quote }}                            
+          env:                        
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ template "global.postgresql.fullname" . }}
                   key: postgresql-password                                             
-            - name: JAVA_OPTS
-              value: |
-                -Dbpa.acapy.url=http://{{ include "acapy.fullname" . }}:{{ .Values.acapy.service.adminPort }} 
-                -Dbpa.acapy.apiKey={{ .Values.acapy.adminURLApiKey }}
-                -Dmicronaut.security.enabled={{ .Values.bpa.securityEnabled }} 
-                -Dmicronaut.server.port=8080
-                -Dbpa.pg.url=jdbc:postgresql://{{ include "global.postgresql.fullname" . }}/{{ .Values.postgresql.postgresqlUsername }}
-                -Dbpa.pg.username={{ .Values.postgresql.postgresqlUsername }}
-                -Dbpa.pg.password=$(POSTGRES_PASSWORD)
-                -Dbpa.host={{ (index .Values.bpa.ingress.hosts 0).host }}
           resources:
             {{- toYaml .Values.bpa.resources | nindent 12 }}
       {{- with .Values.bpa.nodeSelector }}
@@ -83,4 +53,4 @@ spec:
       {{- with .Values.bpa.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}

charts/bpa/values.yaml

@@ -28,56 +28,40 @@ bpa:
     # If not set and create is true, a name is generated using the fullname template
     name: ""  
 
-  # -- enable security (username and password)
-  securityEnabled: true
-
-  # -- Default username
-  userName: admin
-
-  # -- Default password, overwrite default if running in production like environments
-  password: changeme
-
-  # --  Run in did:web mode with read only ledger. If set to true acapy.readOnlyMode has to be true too.
-  webMode: false
-
-  # --  Uni Resolver URL
-  resolverURL: https://resolver.stage.economyofthings.io
-
-  # --  The ledger prefix that is configured with the Uni Resolver
-  didPrefix: "did:sov:iil:"
-
-  # --  The Ledger URL
-  ledgerURL: https://indy-test.bosch-digital.de
-
-  # --  The Ledger Explorer  
-  ledgerBrowser: https://indy-test.bosch-digital.de
-
-  # -- The Agent Name as it should be displayed in the UI
-  agentName: "Business Partner Agent"
-
   # -- application config (remark: all new configuration values will sit here, the other ones can be migrated step by step)
   config: 
-    #test ledger schemas, can be overwritten / extended when e.g. working with other ledger
-    schemas:
-      bank-account:
-        id: "UmZ25DANwS6ngGWB4ye4tN:2:BankAccount:0.1"
-        label: "Bank Account"
-        defaultAttributeName: "iban"
-        # Note: this also works json style restrictions: [{id: 123, label: myLabel}]
-        restrictions:
-          - issuerDid: "did:sov:iil:UmZ25DANwS6ngGWB4ye4tN"
-            label: "Demo Bank"
-      commercial-register:
-        id: "R6WR6n7CQVDjvvmwofHK6S:2:commercialregister:0.1"
-        label: "Commercial Register"
-        defaultAttributeName: "companyName"
-        restrictions:
-          - issuerDid: "did:sov:iil:R6WR6n7CQVDjvvmwofHK6S"
-            label: "Commercial Register"
-
-  imprintURL: 
-
-  privacyPolicyURL:   
+    security:
+      enabled: true  
+    bootstrap:
+      username: admin
+      password: changeme      
+    resolver:
+      url: https://resolver.stage.economyofthings.io
+    ledger:
+      browser: https://indy-test.bosch-digital.de
+    name: Business Partner Agent
+    web:
+      only: false
+    #schemas:
+    #  bank-account:
+    #    id: "UmZ25DANwS6ngGWB4ye4tN:2:BankAccount:0.1"
+    #    label: "Bank Account"
+    #    defaultAttributeName: "iban"
+    #    restrictions:
+    #      - issuerDid: "did:sov:iil:UmZ25DANwS6ngGWB4ye4tN"
+    #        label: "Demo Bank"
+    #  commercial-register:
+    #    id: "R6WR6n7CQVDjvvmwofHK6S:2:commercialregister:0.1"
+    #    label: "Commercial Register"
+    #    defaultAttributeName: "companyName"
+    #    restrictions:
+    #      - issuerDid: "did:sov:iil:R6WR6n7CQVDjvvmwofHK6S"
+    #        label: "Commercial Register"
+    #imprint:
+    #  url: 
+    #privacy:
+    #  policy:
+    #    url:   
 
   imagePullSecrets: []