chore: update wallet-api kubernetes deployments

walt-id · Jun 17, 2024 · 086bfc7 · 086bfc7
1 parent e02e679
commit 086bfc7
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 509 deletions.
diff --git a/waltid-services/waltid-wallet-api/k8s/deployment-dev.yaml b/waltid-services/waltid-wallet-api/k8s/deployment-dev.yaml
@@ -1,18 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: wallet-db-config
+  name: wallet-config
 data:
   db.conf: |
-    database = "db.sqlite"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wallet-datasource-config
-data:
-  db.sqlite.conf: |
-    hikariDataSource {
+    dataSource {
         jdbcUrl = "jdbc:sqlite:/waltid-wallet-api/data/data.db"
         driverClassName = "org.sqlite.JDBC"
         username = ""
@@ -25,21 +17,9 @@ data:
             fullColumnNames = false
         }
     }
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wallet-web-config
-data:
   web.conf: |
     webHost = "0.0.0.0"
     webPort = 4545
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wallet-oidc-config
-data:
   oidc.conf: |
     publicBaseUrl = "https://wallet.walt-test.cloud"
     providerName = keycloak
@@ -59,41 +39,23 @@ data:
             refillRateMinutes: 1
         }
     }
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wallet-rejection-reason-config
-data:
-  rejectionreason.conf: |
-    reasons = [
-        "Unknown sender",
-        "Not relevant to me",
-        "Unsure about accuracy",
-        "Need more details",
-    ]
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wallet-logins-config
-data:
-  logins.conf: |
-    enabledLoginMethods: [
-        "email",
-        "web3",
-        "oidc",
-        "passkeys"
-    ]
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wallet-oci-config
-data:
-  oci.conf: |
-    vaultId = "ocid1.vault.oc1.eu-frankfurt-1.entcvrlraabc4.abtheljrpyimqvzheblr6ce4bqt2snnz36i4etlgtg32n4du5dbrnpgagf6q"
-    compartmentId = "ocid1.compartment.oc1..aaaaaaaawirugoz35riiybcxsvf7bmelqsxo3sajaav5w3i2vqowcwqrllxa"
+#  rejectionreason.conf: |
+#    reasons = [
+#        "Unknown sender",
+#        "Not relevant to me",
+#        "Unsure about accuracy",
+#        "Need more details",
+#    ]
+#  logins.conf: |
+#    enabledLoginMethods: [
+#        "email",
+#        "web3",
+#        "oidc",
+#        "passkeys"
+#    ]
+#  oci.conf: |
+#    vaultId = "ocid1.vault.oc1.eu-frankfurt-1.entcvrlraabc4.abtheljrpyimqvzheblr6ce4bqt2snnz36i4etlgtg32n4du5dbrnpgagf6q"
+#    compartmentId = "ocid1.compartment.oc1..aaaaaaaawirugoz35riiybcxsvf7bmelqsxo3sajaav5w3i2vqowcwqrllxa"
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -128,101 +90,28 @@ spec:
 
           imagePullPolicy: Always
           volumeMounts:
-            - name: wallet-db-config
-              mountPath: "/waltid-wallet-api/config/db.conf"
-              subPath: "db.conf"
-              readOnly: true
-            - name: wallet-datasource-config
-              mountPath: "/waltid-wallet-api/config/db.sqlite.conf"
-              subPath: "db.sqlite.conf"
-              readOnly: true
-            - name: wallet-web-config
-              mountPath: "/waltid-wallet-api/config/web.conf"
-              subPath: "web.conf"
-              readOnly: true
-            - name: wallet-oidc-config
-              mountPath: "/waltid-wallet-api/config/oidc.conf"
-              subPath: "oidc.conf"
-              readOnly: true
-            - name: wallet-rejection-reason-config
-              mountPath: "/waltid-wallet-api/config/rejectionreason.conf"
-              subPath: "rejectionreason.conf"
-              readOnly: true
-            - name: wallet-trust-config
-              mountPath: "/waltid-wallet-api/config/trust.conf"
-              subPath: "trust.conf"
-              readOnly: true
-            - name: wallet-push-config
-              mountPath: "/waltid-wallet-api/config/push.conf"
-              subPath: "push.conf"
-              readOnly: true
-            - name: wallet-logins-config
-              mountPath: "/waltid-wallet-api/config/logins.conf"
-              subPath: "logins.conf"
+            - name: wallet-config
+              mountPath: "/waltid-wallet-api/config/"
               readOnly: true
             - name: wallet-auth-secret
               mountPath: "/waltid-wallet-api/config/auth.conf"
               subPath: "auth.conf"
               readOnly: true
-
-            - name: wallet-oci-config
-              mountPath: "/waltid-wallet-api/config/oci.conf"
-              subPath: "oci.conf"
-              readOnly: true
-            - name: wallet-oci-rest-api-secret
-              mountPath: "/waltid-wallet-api/config/oci-rest-api.conf"
-              subPath: "oci-rest-api.conf"
-              readOnly: true
-            - name: wallet-nft-config
-              mountPath: "/waltid-wallet-api/walt.yaml"
-              subPath: "walt.yaml"
-              readOnly: true
             - mountPath: "/waltid-wallet-api/data/"
               name: wallet-data
           ports:
             - containerPort: 4545
               name: http-api
       volumes:
-        - name: wallet-db-config
-          configMap:
-            name: wallet-db-config
-        - name: wallet-datasource-config
-          configMap:
-            name: wallet-datasource-config
-        - name: wallet-web-config
-          configMap:
-            name: wallet-web-config
-        - name: wallet-oidc-config
-          configMap:
-            name: wallet-oidc-config
-        - name: wallet-rejection-reason-config
-          configMap:
-            name: wallet-rejection-reason-config
-        - name: wallet-trust-config
+        - name: wallet-config
           configMap:
-            name: wallet-trust-config
-        - name: wallet-logins-config
-          configMap:
-            name: wallet-logins-config
-        - name: wallet-oci-config
-          configMap:
-            name: wallet-oci-config
+            name: wallet-config
         - name: wallet-auth-secret
           secret:
             secretName: wallet-auth-secret
-        - name: wallet-oci-rest-api-secret
-          secret:
-            secretName: wallet-oci-rest-api-secret
-        - name: wallet-push-config
-          secret:
-            secretName: wallet-push-config-secret
-        - name: wallet-nft-config
-          secret:
-            secretName: wallet-nft-config-secret
         - name: wallet-data
           persistentVolumeClaim:
             claimName: wallet-data-volume-claim
-
 ---
 kind: Service
 apiVersion: v1