Merge pull request #884 from walt-id/chore/test-ci-cd

chore: Updated test deployment env
walt-id · Jan 16, 2025 · fb05234 · fb05234
2 parents efe61c6 + 50538dd
commit fb05234
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -22,6 +22,11 @@ on:
         required: false
         type: string
         default: "dev"
+      kubeconfig_secret:
+        description: "The name of the kubeconfig secret to use (defaults to 'KUBE_CONFIG')"
+        required: false
+        type: string
+        default: "KUBE_CONFIG"
 
 jobs:
   deploy:
@@ -51,6 +56,6 @@ jobs:
       - name: Continuous deployment - ${{ matrix.services.name }}
         uses: actions-hub/kubectl@master
         env:
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+          KUBE_CONFIG: ${{ secrets[inputs.kubeconfig_secret] }}
         with:
           args: apply -n ${{ matrix.services.namespace }} -f ${{ matrix.services.kube }}/deployment_mod.yaml
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -27,6 +27,9 @@ jobs:
     needs: [ version, gradle-build, docker-build ]
     with:
       version: ${{ needs.version.outputs.release_version }}
+      namespace: 'test-identity-main'
+      portals: 'test-identity-main'
+      kubeconfig_secret: "AKS_KUBE_CONFIG"
   tag:
     name: Create tag
     runs-on: ubuntu-latest

diff --git a/waltid-applications/waltid-web-portal/k8s/deployment-dev.yaml b/waltid-applications/waltid-web-portal/k8s/deployment-dev.yaml
@@ -23,11 +23,11 @@ spec:
             - name: NEXT_PUBLIC_VC_REPO
               value: "https://vc-repo.walt-test.cloud"
             - name: NEXT_PUBLIC_ISSUER
-              value: "https://issuer.portal.walt-test.cloud"
+              value: "https://issuer.portal.test.waltid.cloud"
             - name: NEXT_PUBLIC_VERIFIER
-              value: "https://verifier.portal.walt-test.cloud"
+              value: "https://verifier.portal.test.waltid.cloud"
             - name: NEXT_PUBLIC_WALLET
-              value: "https://wallet.walt-test.cloud"
+              value: "https://wallet.test.waltid.cloud"
           ports:
             - containerPort: 3000
               name: http-portal
@@ -55,10 +55,10 @@ metadata:
 spec:
   tls:
     - hosts:
-        - portal.walt-test.cloud
+        - portal.test.waltid.cloud
       secretName: web-portal-tls-secret
   rules:
-    - host: portal.walt-test.cloud
+    - host: portal.test.waltid.cloud
       http:
         paths:
           - path: /offer

diff --git a/waltid-services/waltid-issuer-api/k8s/deployment-dev.yaml b/waltid-services/waltid-issuer-api/k8s/deployment-dev.yaml
@@ -7,7 +7,7 @@ data:
     webHost = "0.0.0.0"
     webPort = 3000
   issuer-service.conf: |
-    baseUrl = "https://issuer.portal.walt-test.cloud"
+    baseUrl = "https://issuer.portal.test.waltid.cloud"
   authentication-service.conf: |
     name = "keycloak"
     authorizeUrl = "https://keycloak.walt-test.cloud/realms/waltid-keycloak-ktor/protocol/openid-connect/auth"
@@ -69,10 +69,10 @@ metadata:
 spec:
   tls:
     - hosts:
-        - issuer.portal.walt-test.cloud
+        - issuer.portal.test.waltid.cloud
       secretName: issuer-tls-secret
   rules:
-    - host: issuer.portal.walt-test.cloud
+    - host: issuer.portal.test.waltid.cloud
       http:
         paths:
           - path: /

diff --git a/waltid-services/waltid-verifier-api/k8s/deployment-dev.yaml b/waltid-services/waltid-verifier-api/k8s/deployment-dev.yaml
@@ -11,12 +11,12 @@ data:
     webHost = "0.0.0.0"
     webPort = 3000
   verifier-service.conf: |
-    baseUrl = "https://verifier.portal.walt-test.cloud"
+    baseUrl = "https://verifier.portal.test.waltid.cloud"
     requestSigningKeyFile = "/waltid-verifier-api/request-signing-secret/ec.key"
     requestSigningCertFile = "/waltid-verifier-api/request-signing-secret/ec.crt"
-    x509SanDnsClientId = "verifier.portal.walt-test.cloud"
+    x509SanDnsClientId = "verifier.portal.test.waltid.cloud"
   entra.conf: |
-    callbackUrl = "https://verifier.portal.walt-test.cloud/entra/verification-callback/"
+    callbackUrl = "https://verifier.portal.test.waltid.cloud/entra/verification-callback/"
 ---
 kind: Deployment
 apiVersion: apps/v1
@@ -78,10 +78,10 @@ metadata:
 spec:
   tls:
     - hosts:
-        - verifier.portal.walt-test.cloud
+        - verifier.portal.test.waltid.cloud
       secretName: verifier-tls-secret
   rules:
-    - host: verifier.portal.walt-test.cloud
+    - host: verifier.portal.test.waltid.cloud
       http:
         paths:
           - path: /

diff --git a/waltid-services/waltid-wallet-api/k8s/deployment-dev.yaml b/waltid-services/waltid-wallet-api/k8s/deployment-dev.yaml
@@ -24,7 +24,7 @@ data:
     webHost = "0.0.0.0"
     webPort = 4545
   oidc.conf: |
-    publicBaseUrl = "https://wallet-dev.walt-test.cloud"
+    publicBaseUrl = "https://wallet-dev.test.waltid.cloud"
     providerName = keycloak
     oidcRealm = "https://keycloak.walt-test.cloud/realms/waltid-keycloak-ktor"
     oidcJwks = "${oidcRealm}/protocol/openid-connect/certs"
@@ -160,9 +160,9 @@ spec:
           imagePullPolicy: Always
           env:
             - name: NUXT_PUBLIC_ISSUER_CALLBACK_URL
-              value: "https://wallet-dev.walt-test.cloud"
+              value: "https://wallet-dev.test.waltid.cloud"
             - name: NUXT_PUBLIC_DEMO_WALLET_URL
-              value: "https://wallet.walt-test.cloud"
+              value: "https://wallet.test.waltid.cloud"
           ports:
             - containerPort: 7104
               name: http-api
@@ -189,9 +189,9 @@ spec:
           imagePullPolicy: Always
           env:
             - name: NUXT_PUBLIC_ISSUER_CALLBACK_URL
-              value: "https://wallet.walt-test.cloud"
+              value: "https://wallet.test.waltid.cloud"
             - name: NUXT_PUBLIC_DEV_WALLET_URL
-              value: "https://wallet-dev.walt-test.cloud"
+              value: "https://wallet-dev.test.waltid.cloud"
             - name: NUXT_PUBLIC_CREDENTIALS_REPOSITORY_URL
               value: "https://vc-repo.walt-test.cloud"
           ports:
@@ -238,13 +238,13 @@ metadata:
 spec:
   tls:
     - hosts:
-        - wallet.walt-test.cloud
+        - wallet.test.waltid.cloud
       secretName: test-wallet-demo-tls-secret
     - hosts:
-        - wallet-dev.walt-test.cloud
+        - wallet-dev.test.waltid.cloud
       secretName: test-wallet-dev-tls-secret
   rules:
-    - host: wallet-dev.walt-test.cloud
+    - host: wallet-dev.test.waltid.cloud
       http:
         paths:
           - path: /wallet-api/
@@ -296,7 +296,7 @@ spec:
                 name: waltid-dev-wallet
                 port:
                   name: http
-    - host: wallet.walt-test.cloud
+    - host: wallet.test.waltid.cloud
       http:
         paths:
           - path: /wallet-api/