diff --git a/hub-auth/Makefile b/auth/Makefile similarity index 85% rename from hub-auth/Makefile rename to auth/Makefile index 52cab819..188d85f7 100644 --- a/hub-auth/Makefile +++ b/auth/Makefile @@ -20,10 +20,10 @@ OS = $(shell uname -s | tr '[:upper:]' '[:lower:]') ARCH = $(shell uname -m | sed 's/x86_64/amd64/') #IMAGES -HUB_AUTH_IMG ?= ghcr.io/trustbloc-cicd/auth:0.1.9-snapshot-5a7b16c +AUTH_IMG ?= ghcr.io/trustbloc-cicd/auth:0.1.9-snapshot-5a7b16c # do not modify -KUSTOMIZE_DIR = kustomize/hub-auth +KUSTOMIZE_DIR = kustomize/auth KEYS_OUTPUT_DIR = ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/keys CERTS_OUTPUT_DIR = ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/certs PREFIX ?= @@ -64,7 +64,7 @@ generate-test-keys: clean-keys docker.io/frapsoft/openssl:latest .PHONY: deploy -deploy: prechecks kustomize kubectl set-images set-labels deploy-hub-auth +deploy: prechecks kustomize kubectl set-images set-labels deploy-auth .PHONY: prechecks prechecks: @@ -75,30 +75,30 @@ endif .PHONY: set-labels set-labels: kustomize - @pushd ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/hub-auth &&\ + @pushd ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/auth &&\ ${KUSTOMIZE} edit set label ${COMMON_LABELS} &&\ popd .PHONY: set-images set-images: kustomize @pushd ${KUSTOMIZE_DIR}/base &&\ - ${KUSTOMIZE} edit set image hub-auth=${HUB_AUTH_IMG} &&\ + ${KUSTOMIZE} edit set image auth=${AUTH_IMG} &&\ popd -.PHONY: deploy-hub-auth -deploy-hub-auth: prechecks kustomize kubectl - @docker pull $(HUB_AUTH_IMG) - @minikube image load $(HUB_AUTH_IMG) +.PHONY: deploy-auth +deploy-auth: prechecks kustomize kubectl + @docker pull $(AUTH_IMG) + @minikube image load $(AUTH_IMG) $(KUSTOMIZE) build ${KUSTOMIZE_BUILD_OPTS} \ - ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/hub-auth | $(KUBECTL) apply -f - + ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/auth | $(KUBECTL) apply -f - .PHONY: undeploy -undeploy: prechecks kustomize kubectl set-images set-labels undeploy-hub-auth +undeploy: prechecks kustomize kubectl set-images set-labels undeploy-auth -.PHONY: undeploy-hub-auth -undeploy-hub-auth: prechecks kustomize kubectl +.PHONY: undeploy-auth +undeploy-auth: prechecks kustomize kubectl $(KUSTOMIZE) build ${KUSTOMIZE_BUILD_OPTS} \ - ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/hub-auth | $(KUBECTL) delete -f - + ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/auth | $(KUBECTL) delete -f - .PHONY: kustomize kustomize: diff --git a/hub-auth/README.md b/auth/README.md similarity index 81% rename from hub-auth/README.md rename to auth/README.md index b11c7dc6..4d752cfe 100644 --- a/hub-auth/README.md +++ b/auth/README.md @@ -1,4 +1,4 @@ -# [HUB-AUTH](https://github.com/trustbloc/hub-auth) k8s deployment # +# [Auth](https://github.com/trustbloc/auth) k8s deployment # ## pre-requisits @@ -17,9 +17,9 @@ ## options and features * By default dns domain is `local.trustboc.dev`. To run with different domain (See next), run with: `make DOMAIN=ali.trustbloc.dev` * Will create an Ingress for external access. When running with unregistered dns domains, create records (/etc/hosts) for: - - `hub-auth.DOMAIN` + - `auth.DOMAIN` * if running `podman` pass `CONTAINER_CMD=podman` as option to make -* Running with none self-signed certificates: place certs into kustomize/hub-auth/overlays/sandbox/certs, then run with: `make setup-no-certs`. +* Running with none self-signed certificates: place certs into kustomize/auth/overlays/sandbox/certs, then run with: `make setup-no-certs`. >files: - ca.crt - tls.crt diff --git a/hub-auth/kustomize/hub-auth/.gitignore b/auth/kustomize/auth/.gitignore similarity index 100% rename from hub-auth/kustomize/hub-auth/.gitignore rename to auth/kustomize/auth/.gitignore diff --git a/hub-auth/kustomize/hub-auth/base/auth-config.yml b/auth/kustomize/auth/base/auth-config.yml similarity index 100% rename from hub-auth/kustomize/hub-auth/base/auth-config.yml rename to auth/kustomize/auth/base/auth-config.yml diff --git a/hub-auth/kustomize/hub-auth/base/auth-secret.env b/auth/kustomize/auth/base/auth-secret.env similarity index 100% rename from hub-auth/kustomize/hub-auth/base/auth-secret.env rename to auth/kustomize/auth/base/auth-secret.env diff --git a/hub-auth/kustomize/hub-auth/base/auth.env b/auth/kustomize/auth/base/auth.env similarity index 66% rename from hub-auth/kustomize/hub-auth/base/auth.env rename to auth/kustomize/auth/base/auth.env index 5ecba277..fd17ea99 100644 --- a/hub-auth/kustomize/hub-auth/base/auth.env +++ b/auth/kustomize/auth/base/auth.env @@ -9,12 +9,12 @@ AUTH_REST_DATABASE_TYPE=mem AUTH_REST_DATABASE_PREFIX=authrest_ AUTH_REST_OIDC_CALLBACK=http:// AUTH_REST_HYDRA_URL=http:// -AUTH_REST_OIDC_PROVIDERS_CONFIG=/etc/hub-auth/config/providers.yml +AUTH_REST_OIDC_PROVIDERS_CONFIG=/etc/auth/config/providers.yml AUTH_REST_SDS_DOCS_URL=http:// AUTH_REST_SDS_OPSKEYS_URL=http:// AUTH_REST_KEYSERVER_AUTH_URL=http:// AUTH_REST_KEYSERVER_OPS_URL=http:// -AUTH_REST_COOKIE_AUTH_KEY=/etc/hub-auth/keys/auth.key -AUTH_REST_COOKIE_ENC_KEY=/etc/hub-auth/keys/enc.key +AUTH_REST_COOKIE_AUTH_KEY=/etc/auth/keys/auth.key +AUTH_REST_COOKIE_ENC_KEY=/etc/auth/keys/enc.key AUTH_REST_STATIC_IMAGES=/etc/static/images -AUTH_REST_EXTERNAL_URL=https://hub-auth.||DOMAIN|| +AUTH_REST_EXTERNAL_URL=https://auth.||DOMAIN|| diff --git a/hub-auth/kustomize/hub-auth/base/auth.yml b/auth/kustomize/auth/base/auth.yml similarity index 93% rename from hub-auth/kustomize/hub-auth/base/auth.yml rename to auth/kustomize/auth/base/auth.yml index c84c8cb7..53e8dffb 100644 --- a/hub-auth/kustomize/hub-auth/base/auth.yml +++ b/auth/kustomize/auth/base/auth.yml @@ -39,7 +39,7 @@ spec: name: auth-env - secretRef: name: auth-env-secret - image: hub-auth:latest + image: auth:latest args: ["start"] ports: - containerPort: 8081 @@ -47,10 +47,10 @@ spec: name: http-port volumeMounts: - name: keys - mountPath: /etc/hub-auth/keys + mountPath: /etc/auth/keys readOnly: true - name: config - mountPath: /etc/hub-auth/config + mountPath: /etc/auth/config readOnly: true - name: auth-static-config mountPath: /etc/static/config diff --git a/hub-auth/kustomize/hub-auth/base/kustomization.yaml b/auth/kustomize/auth/base/kustomization.yaml similarity index 97% rename from hub-auth/kustomize/hub-auth/base/kustomization.yaml rename to auth/kustomize/auth/base/kustomization.yaml index 3e2db4ba..8b0a4ba3 100644 --- a/hub-auth/kustomize/hub-auth/base/kustomization.yaml +++ b/auth/kustomize/auth/base/kustomization.yaml @@ -38,6 +38,6 @@ resources: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: -- name: hub-auth +- name: auth newName: ghcr.io/trustbloc-cicd/auth newTag: 0.1.9-snapshot-5a7b16c diff --git a/auth/kustomize/auth/overlays/common/auth-config.yml b/auth/kustomize/auth/overlays/common/auth-config.yml new file mode 100644 index 00000000..47c4fb74 --- /dev/null +++ b/auth/kustomize/auth/overlays/common/auth-config.yml @@ -0,0 +1,19 @@ +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +providers: + mockbank: + url: https://hydra.||DOMAIN||/ + clientID: auth + clientSecret: auth-secret + name: Demo OIDC + signUpIconURL: + en: https://auth.||DOMAIN||/static/images/en--demo-sign-up-button.svg + fr: https://auth.||DOMAIN||/static/images/fr--demo-sign-up-button.svg + signInIconURL: + en: https://auth.||DOMAIN||/static/images/en--demo-sign-in-button.svg + fr: https://auth.||DOMAIN||/static/images/fr--demo-sign-in-button.svg + order: 1 \ No newline at end of file diff --git a/hub-auth/kustomize/hub-auth/overlays/common/auth-secret.env b/auth/kustomize/auth/overlays/common/auth-secret.env similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/auth-secret.env rename to auth/kustomize/auth/overlays/common/auth-secret.env diff --git a/hub-auth/kustomize/hub-auth/overlays/common/auth.env b/auth/kustomize/auth/overlays/common/auth.env similarity index 90% rename from hub-auth/kustomize/hub-auth/overlays/common/auth.env rename to auth/kustomize/auth/overlays/common/auth.env index 1c3f378d..ee16ff79 100644 --- a/hub-auth/kustomize/hub-auth/overlays/common/auth.env +++ b/auth/kustomize/auth/overlays/common/auth.env @@ -5,7 +5,7 @@ # AUTH_REST_DATABASE_TYPE=mongodb -AUTH_REST_OIDC_CALLBACK=https://hub-auth.||DOMAIN||/oauth2/callback +AUTH_REST_OIDC_CALLBACK=https://auth.||DOMAIN||/oauth2/callback AUTH_REST_HYDRA_URL=https://hub-hydra-admin.||DOMAIN|| AUTH_REST_SDS_DOCS_URL=https://TODO.docs.sds.org/ AUTH_REST_SDS_OPSKEYS_URL=https://TODO.keys.sds.org/ diff --git a/hub-auth/kustomize/hub-auth/overlays/common/kustomization.yaml b/auth/kustomize/auth/overlays/common/kustomization.yaml similarity index 96% rename from hub-auth/kustomize/hub-auth/overlays/common/kustomization.yaml rename to auth/kustomize/auth/overlays/common/kustomization.yaml index 7a2f0cb0..20fdd046 100644 --- a/hub-auth/kustomize/hub-auth/overlays/common/kustomization.yaml +++ b/auth/kustomize/auth/overlays/common/kustomization.yaml @@ -12,9 +12,9 @@ # "wordpress" becomes "alices-wordpress". # Note that it should also match with the prefix (text before '-') of the namespace # field above. -namePrefix: hub- + commonLabels: - component: hub-auth + component: auth group: core project: trustbloc diff --git a/hub-auth/kustomize/hub-auth/overlays/common/sedb64transform.yml b/auth/kustomize/auth/overlays/common/sedb64transform.yml similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/sedb64transform.yml rename to auth/kustomize/auth/overlays/common/sedb64transform.yml diff --git a/hub-auth/kustomize/hub-auth/overlays/common/sedtransform.yml b/auth/kustomize/auth/overlays/common/sedtransform.yml similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/sedtransform.yml rename to auth/kustomize/auth/overlays/common/sedtransform.yml diff --git a/hub-auth/kustomize/hub-auth/overlays/common/static/config/access_policy.json b/auth/kustomize/auth/overlays/common/static/config/access_policy.json similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/static/config/access_policy.json rename to auth/kustomize/auth/overlays/common/static/config/access_policy.json diff --git a/hub-auth/kustomize/hub-auth/overlays/common/static/images/en--demo-sign-in-button.svg b/auth/kustomize/auth/overlays/common/static/images/en--demo-sign-in-button.svg similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/static/images/en--demo-sign-in-button.svg rename to auth/kustomize/auth/overlays/common/static/images/en--demo-sign-in-button.svg diff --git a/hub-auth/kustomize/hub-auth/overlays/common/static/images/en--demo-sign-up-button.svg b/auth/kustomize/auth/overlays/common/static/images/en--demo-sign-up-button.svg similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/static/images/en--demo-sign-up-button.svg rename to auth/kustomize/auth/overlays/common/static/images/en--demo-sign-up-button.svg diff --git a/hub-auth/kustomize/hub-auth/overlays/common/static/images/fr--demo-sign-in-button.svg b/auth/kustomize/auth/overlays/common/static/images/fr--demo-sign-in-button.svg similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/static/images/fr--demo-sign-in-button.svg rename to auth/kustomize/auth/overlays/common/static/images/fr--demo-sign-in-button.svg diff --git a/hub-auth/kustomize/hub-auth/overlays/common/static/images/fr--demo-sign-up-button.svg b/auth/kustomize/auth/overlays/common/static/images/fr--demo-sign-up-button.svg similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/common/static/images/fr--demo-sign-up-button.svg rename to auth/kustomize/auth/overlays/common/static/images/fr--demo-sign-up-button.svg diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/add-ca.yml b/auth/kustomize/auth/overlays/local/auth/add-ca.yml similarity index 91% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/add-ca.yml rename to auth/kustomize/auth/overlays/local/auth/add-ca.yml index a3bac43b..0fcba16d 100644 --- a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/add-ca.yml +++ b/auth/kustomize/auth/overlays/local/auth/add-ca.yml @@ -14,7 +14,7 @@ spec: volumes: - name: ca-cert configMap: - name: hub-auth-ca-cert + name: auth-ca-cert containers: - name: auth volumeMounts: diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/auth.env b/auth/kustomize/auth/overlays/local/auth/auth.env similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/auth.env rename to auth/kustomize/auth/overlays/local/auth/auth.env diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/ingress.yml b/auth/kustomize/auth/overlays/local/auth/ingress.yml similarity index 96% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/ingress.yml rename to auth/kustomize/auth/overlays/local/auth/ingress.yml index 9a4a1031..a5fc0ac1 100644 --- a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/ingress.yml +++ b/auth/kustomize/auth/overlays/local/auth/ingress.yml @@ -8,7 +8,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: hub-auth + name: auth labels: app: auth spec: diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/kustomization.yaml b/auth/kustomize/auth/overlays/local/auth/kustomization.yaml similarity index 88% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/kustomization.yaml rename to auth/kustomize/auth/overlays/local/auth/kustomization.yaml index 429e94e9..22ec1719 100644 --- a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/kustomization.yaml +++ b/auth/kustomize/auth/overlays/local/auth/kustomization.yaml @@ -13,7 +13,7 @@ # Note that it should also match with the prefix (text before '-') of the namespace # field above. commonLabels: - component: hub-auth + component: auth group: core instance: local project: trustbloc @@ -26,22 +26,22 @@ secretGenerator: - files: - ../certs/tls.crt - ../certs/tls.key - name: hub-auth-wildcard-cert + name: auth-wildcard-cert type: kubernetes.io/tls - behavior: replace files: - ../keys/auth.key - ../keys/enc.key - name: hub-auth-keys + name: auth-keys configMapGenerator: - behavior: merge envs: - auth.env - name: hub-auth-env + name: auth-env - files: - ../certs/ca.crt - name: hub-auth-ca-cert + name: auth-ca-cert replacements: - path: replacements.yml @@ -49,7 +49,7 @@ replacements: targets: null - source: kind: Secret - name: hub-auth-wildcard-cert + name: auth-wildcard-cert version: v1 targets: - fieldPaths: @@ -66,7 +66,7 @@ replacements: - spec.tls.0.secretName select: kind: Ingress - name: hub-auth + name: auth resources: - ../../common diff --git a/hub-router/kustomize/hub-router/overlays/local/router/replacements.yml b/auth/kustomize/auth/overlays/local/auth/replacements.yml similarity index 83% rename from hub-router/kustomize/hub-router/overlays/local/router/replacements.yml rename to auth/kustomize/auth/overlays/local/auth/replacements.yml index af3b33d4..4a60d9b7 100644 --- a/hub-router/kustomize/hub-router/overlays/local/router/replacements.yml +++ b/auth/kustomize/auth/overlays/local/auth/replacements.yml @@ -1,6 +1,6 @@ source: kind: Service - name: router + name: auth version: v1 targets: - fieldPaths: @@ -10,9 +10,9 @@ targets: delimiter: . select: kind: Ingress - name: router + name: auth - fieldPaths: - spec.rules.0.http.paths.0.backend.service.name select: kind: Ingress - name: router + name: auth diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/sedb64transform.yml b/auth/kustomize/auth/overlays/local/auth/sedb64transform.yml similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/sedb64transform.yml rename to auth/kustomize/auth/overlays/local/auth/sedb64transform.yml diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/sedtransform.yml b/auth/kustomize/auth/overlays/local/auth/sedtransform.yml similarity index 100% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/sedtransform.yml rename to auth/kustomize/auth/overlays/local/auth/sedtransform.yml diff --git a/hub-auth/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer b/auth/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer similarity index 100% rename from hub-auth/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer rename to auth/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer diff --git a/hub-auth/kustomize/plugin/svceng/sedtransformer/SedTransformer b/auth/kustomize/plugin/svceng/sedtransformer/SedTransformer similarity index 100% rename from hub-auth/kustomize/plugin/svceng/sedtransformer/SedTransformer rename to auth/kustomize/plugin/svceng/sedtransformer/SedTransformer diff --git a/hub-auth/scripts/generate_test_certs.sh b/auth/scripts/generate_test_certs.sh similarity index 100% rename from hub-auth/scripts/generate_test_certs.sh rename to auth/scripts/generate_test_certs.sh diff --git a/hub-auth/scripts/generate_test_keys.sh b/auth/scripts/generate_test_keys.sh similarity index 100% rename from hub-auth/scripts/generate_test_keys.sh rename to auth/scripts/generate_test_keys.sh diff --git a/edv/kustomize/edv/overlays/common/edv/config.env b/edv/kustomize/edv/overlays/common/edv/config.env index 95af7812..39c201fe 100644 --- a/edv/kustomize/edv/overlays/common/edv/config.env +++ b/edv/kustomize/edv/overlays/common/edv/config.env @@ -14,4 +14,4 @@ EDV_DID_DOMAIN=||BLOC_DOMAIN|| EDV_DATABASE_TIMEOUT=60 EDV_TLS_SYSTEMCERTPOOL=true EDV_AUTH_TYPE=GNAP,ZCAP -EDV_AUTH_SERVER_URL=https://hub-auth.||DOMAIN|| +EDV_AUTH_SERVER_URL=https://auth.||DOMAIN|| diff --git a/hub-auth/kustomize/hub-auth/overlays/common/auth-config.yml b/hub-auth/kustomize/hub-auth/overlays/common/auth-config.yml deleted file mode 100644 index 3d6c60e6..00000000 --- a/hub-auth/kustomize/hub-auth/overlays/common/auth-config.yml +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright SecureKey Technologies Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -providers: - mockbank: - url: https://hydra.||DOMAIN||/ - clientID: hub-auth - clientSecret: hub-auth-secret - name: Demo OIDC - signUpIconURL: - en: https://hub-auth.||DOMAIN||/static/images/en--demo-sign-up-button.svg - fr: https://hub-auth.||DOMAIN||/static/images/fr--demo-sign-up-button.svg - signInIconURL: - en: https://hub-auth.||DOMAIN||/static/images/en--demo-sign-in-button.svg - fr: https://hub-auth.||DOMAIN||/static/images/fr--demo-sign-in-button.svg - order: 1 \ No newline at end of file diff --git a/kms/kustomize/kms/overlays/common/vault-kms/kms/config.env b/kms/kustomize/kms/overlays/common/vault-kms/kms/config.env index 4c20f09c..d0d9bcba 100644 --- a/kms/kustomize/kms/overlays/common/vault-kms/kms/config.env +++ b/kms/kustomize/kms/overlays/common/vault-kms/kms/config.env @@ -15,4 +15,4 @@ KMS_TLS_SYSTEMCERTPOOL=true KMS_BASE_URL=https://vault-kms.||DOMAIN|| KMS_DID_DOMAIN=||BLOC_DOMAIN|| KMS_CACHE_ENABLE=true -KMS_AUTH_SERVER_URL=https://hub-auth.||DOMAIN|| +KMS_AUTH_SERVER_URL=https://auth.||DOMAIN|| diff --git a/hub-router/Makefile b/mediator/Makefile similarity index 92% rename from hub-router/Makefile rename to mediator/Makefile index 552dce9a..f66c20b8 100644 --- a/hub-router/Makefile +++ b/mediator/Makefile @@ -28,7 +28,7 @@ ARCH = $(shell uname -m | sed 's/x86_64/amd64/') MEDIATOR_IMG ?= ghcr.io/trustbloc-cicd/mediator:0.1.9-snapshot-12ee465 # do not modify -KUSTOMIZE_DIR = kustomize/hub-router +KUSTOMIZE_DIR = kustomize/mediator CERTS_OUTPUT_DIR = ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/certs PREFIX ?= KUSTOMIZE_BUILD_OPTS ?= --load-restrictor LoadRestrictionsNone --enable-alpha-plugins @@ -59,7 +59,7 @@ generate-test-certs: clean-certs @cd ${CERTS_OUTPUT_DIR} && ln -fs ${DOMAIN}.crt tls.crt .PHONY: deploy -deploy: prechecks kustomize kubectl set-images set-labels deploy-hub-router +deploy: prechecks kustomize kubectl set-images set-labels deploy-mediator .PHONY: prechecks prechecks: @@ -77,21 +77,21 @@ set-labels: kustomize .PHONY: set-images set-images: kustomize @pushd ${KUSTOMIZE_DIR}/base &&\ - ${KUSTOMIZE} edit set image hub-router=${MEDIATOR_IMG} &&\ + ${KUSTOMIZE} edit set image mediator=${MEDIATOR_IMG} &&\ popd -.PHONY: deploy-hub-router -deploy-hub-router: prechecks kustomize kubectl +.PHONY: deploy-mediator +deploy-mediator: prechecks kustomize kubectl @docker pull $(MEDIATOR_IMG) @minikube image load $(MEDIATOR_IMG) $(KUSTOMIZE) build ${KUSTOMIZE_BUILD_OPTS} \ ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV} | $(KUBECTL) apply -f - .PHONY: undeploy -undeploy: prechecks kustomize kubectl set-images set-labels undeploy-hub-router +undeploy: prechecks kustomize kubectl set-images set-labels undeploy-mediator -.PHONY: undeploy-hub-router -undeploy-hub-router: prechecks kustomize kubectl +.PHONY: undeploy-mediator +undeploy-mediator: prechecks kustomize kubectl $(KUSTOMIZE) build ${KUSTOMIZE_BUILD_OPTS} \ ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV} | $(KUBECTL) delete -f - diff --git a/hub-router/README.md b/mediator/README.md similarity index 82% rename from hub-router/README.md rename to mediator/README.md index f970a78d..24a32146 100644 --- a/hub-router/README.md +++ b/mediator/README.md @@ -1,4 +1,4 @@ -# [Hub Router](https://github.com/trustbloc/hub-router) k8s deployment # +# [Mediator](https://github.com/trustbloc/mediator) k8s deployment # ## pre-requisits @@ -8,19 +8,19 @@ ## Quick Run * `make all` -* `make deploy-hub-router` +* `make deploy-mediator` ## Cleanup -* `make undeploy-hub-router` +* `make undeploy-mediator` * `make clean` ## options and features * By default dns domain is `local.trustboc.dev`. To run with different domain (See next), run with: `make DOMAIN=ali.trustbloc.dev` * By default Bloc domain is `orb-1.trustboc.dev`. To run with different domain (See next), run with: `make BLOC_DOMAIN=orb-1.ali.trustbloc.dev` * Will create an Ingress for external access. When running with unregistered dns domains, create records (/etc/hosts) for: - - `router.DOMAIN` - - `router-ws.DOMAIN` - - `router-api.DOMAIN` + - `mediator.DOMAIN` + - `mediator-ws.DOMAIN` + - `mediator-api.DOMAIN` * if running `podman` pass `CONTAINER_CMD=podman` as option to make * Running with none self-signed certificates: place certs into kustomize/wallet/overlays/sandbox/certs, then run with: `make setup-no-certs`. >files: diff --git a/hub-router/kustomize/hub-router/.gitignore b/mediator/kustomize/mediator/.gitignore similarity index 100% rename from hub-router/kustomize/hub-router/.gitignore rename to mediator/kustomize/mediator/.gitignore diff --git a/hub-router/kustomize/hub-router/base/config.env b/mediator/kustomize/mediator/base/config.env similarity index 100% rename from hub-router/kustomize/hub-router/base/config.env rename to mediator/kustomize/mediator/base/config.env diff --git a/hub-router/kustomize/hub-router/base/deployment.yml b/mediator/kustomize/mediator/base/deployment.yml similarity index 78% rename from hub-router/kustomize/hub-router/base/deployment.yml rename to mediator/kustomize/mediator/base/deployment.yml index 66b3ada7..4485c1e2 100644 --- a/hub-router/kustomize/hub-router/base/deployment.yml +++ b/mediator/kustomize/mediator/base/deployment.yml @@ -8,29 +8,29 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: hub-router + name: mediator spec: replicas: 1 selector: matchLabels: - app: router + app: mediator group: core - component: hub-router + component: mediator template: metadata: labels: - app: router + app: mediator group: core - component: hub-router + component: mediator spec: containers: - - name: router + - name: mediator envFrom: - configMapRef: - name: router-env + name: mediator-env - secretRef: - name: router-env-secret - image: hub-router:latest + name: mediator-env-secret + image: mediator:latest args: ["start"] ports: - containerPort: 8081 diff --git a/hub-router/kustomize/hub-router/base/kustomization.yaml b/mediator/kustomize/mediator/base/kustomization.yaml similarity index 89% rename from hub-router/kustomize/hub-router/base/kustomization.yaml rename to mediator/kustomize/mediator/base/kustomization.yaml index 1f1b94d9..50299afe 100644 --- a/hub-router/kustomize/hub-router/base/kustomization.yaml +++ b/mediator/kustomize/mediator/base/kustomization.yaml @@ -17,12 +17,12 @@ generatorOptions: {} configMapGenerator: - envs: - config.env - name: router-env + name: mediator-env secretGenerator: - envs: - secret.env - name: router-env-secret + name: mediator-env-secret resources: - deployment.yml @@ -32,6 +32,6 @@ resources: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: -- name: hub-router +- name: mediator newName: ghcr.io/trustbloc-cicd/mediator newTag: 0.1.9-snapshot-12ee465 diff --git a/hub-router/kustomize/hub-router/base/secret.env b/mediator/kustomize/mediator/base/secret.env similarity index 100% rename from hub-router/kustomize/hub-router/base/secret.env rename to mediator/kustomize/mediator/base/secret.env diff --git a/hub-router/kustomize/hub-router/base/service.yml b/mediator/kustomize/mediator/base/service.yml similarity index 80% rename from hub-router/kustomize/hub-router/base/service.yml rename to mediator/kustomize/mediator/base/service.yml index 4adbd97e..a84beb5e 100644 --- a/hub-router/kustomize/hub-router/base/service.yml +++ b/mediator/kustomize/mediator/base/service.yml @@ -9,7 +9,7 @@ apiVersion: v1 kind: Service metadata: creationTimestamp: null - name: router + name: mediator spec: ports: - name: http @@ -17,9 +17,9 @@ spec: protocol: TCP targetPort: http-port selector: - app: router + app: mediator group: core - component: hub-router + component: mediator status: loadBalancer: {} --- @@ -27,7 +27,7 @@ apiVersion: v1 kind: Service metadata: creationTimestamp: null - name: router-ws + name: mediator-ws spec: ports: - name: http @@ -35,9 +35,9 @@ spec: protocol: TCP targetPort: ws-port selector: - app: router + app: mediator group: core - component: hub-router + component: mediator status: loadBalancer: {} --- @@ -45,7 +45,7 @@ apiVersion: v1 kind: Service metadata: creationTimestamp: null - name: router-api + name: mediator-api spec: ports: - name: http @@ -53,8 +53,8 @@ spec: protocol: TCP targetPort: api-port selector: - app: router + app: mediator group: core - component: hub-router + component: mediator status: loadBalancer: {} diff --git a/hub-router/kustomize/hub-router/overlays/common/config.env b/mediator/kustomize/mediator/overlays/common/config.env similarity index 73% rename from hub-router/kustomize/hub-router/overlays/common/config.env rename to mediator/kustomize/mediator/overlays/common/config.env index 957c5a7a..463d3a61 100644 --- a/hub-router/kustomize/hub-router/overlays/common/config.env +++ b/mediator/kustomize/mediator/overlays/common/config.env @@ -5,8 +5,8 @@ # MEDIATOR_DSN_TIMEOUT=120 -MEDIATOR_DIDCOMM_HTTP_HOST_EXTERNAL=https://router.||DOMAIN|| -MEDIATOR_DIDCOMM_WS_HOST_EXTERNAL=wss://router-ws.||DOMAIN|| +MEDIATOR_DIDCOMM_HTTP_HOST_EXTERNAL=https://mediator.||DOMAIN|| +MEDIATOR_DIDCOMM_WS_HOST_EXTERNAL=wss://mediator-ws.||DOMAIN|| MEDIATOR_TLS_SYSTEMCERTPOOL=true MEDIATOR_ORB_DOMAINS=https://||BLOC_DOMAIN|| MEDIATOR_KEY_TYPE=ed25519 diff --git a/hub-router/kustomize/hub-router/overlays/common/kustomization.yaml b/mediator/kustomize/mediator/overlays/common/kustomization.yaml similarity index 91% rename from hub-router/kustomize/hub-router/overlays/common/kustomization.yaml rename to mediator/kustomize/mediator/overlays/common/kustomization.yaml index 1f9e32c3..74e64a8c 100644 --- a/hub-router/kustomize/hub-router/overlays/common/kustomization.yaml +++ b/mediator/kustomize/mediator/overlays/common/kustomization.yaml @@ -14,7 +14,7 @@ # field above. commonLabels: project: trustbloc - component: hub-router + component: mediator group: core @@ -25,13 +25,13 @@ secretGenerator: - behavior: merge envs: - secret.env - name: router-env-secret + name: mediator-env-secret configMapGenerator: - behavior: merge envs: - config.env - name: router-env + name: mediator-env resources: - ../../base diff --git a/hub-router/kustomize/hub-router/overlays/common/secret.env b/mediator/kustomize/mediator/overlays/common/secret.env similarity index 100% rename from hub-router/kustomize/hub-router/overlays/common/secret.env rename to mediator/kustomize/mediator/overlays/common/secret.env diff --git a/hub-router/kustomize/hub-router/overlays/common/sedb64transform.yml b/mediator/kustomize/mediator/overlays/common/sedb64transform.yml similarity index 100% rename from hub-router/kustomize/hub-router/overlays/common/sedb64transform.yml rename to mediator/kustomize/mediator/overlays/common/sedb64transform.yml diff --git a/hub-router/kustomize/hub-router/overlays/common/sedtransform.yml b/mediator/kustomize/mediator/overlays/common/sedtransform.yml similarity index 100% rename from hub-router/kustomize/hub-router/overlays/common/sedtransform.yml rename to mediator/kustomize/mediator/overlays/common/sedtransform.yml diff --git a/hub-router/kustomize/hub-router/overlays/local/add-ca.yml b/mediator/kustomize/mediator/overlays/local/add-ca.yml similarity index 82% rename from hub-router/kustomize/hub-router/overlays/local/add-ca.yml rename to mediator/kustomize/mediator/overlays/local/add-ca.yml index c8f1fb2e..9f48cf3d 100644 --- a/hub-router/kustomize/hub-router/overlays/local/add-ca.yml +++ b/mediator/kustomize/mediator/overlays/local/add-ca.yml @@ -7,16 +7,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: hub-router + name: mediator spec: template: spec: volumes: - name: ca-cert configMap: - name: router-ca-cert + name: mediator-ca-cert containers: - - name: router + - name: mediator volumeMounts: - name: ca-cert mountPath: /etc/wallet/tls diff --git a/hub-router/kustomize/hub-router/overlays/local/config.env b/mediator/kustomize/mediator/overlays/local/config.env similarity index 100% rename from hub-router/kustomize/hub-router/overlays/local/config.env rename to mediator/kustomize/mediator/overlays/local/config.env diff --git a/hub-router/kustomize/hub-router/overlays/local/kustomization.yaml b/mediator/kustomize/mediator/overlays/local/kustomization.yaml similarity index 70% rename from hub-router/kustomize/hub-router/overlays/local/kustomization.yaml rename to mediator/kustomize/mediator/overlays/local/kustomization.yaml index 9887df6a..e6c0469e 100644 --- a/hub-router/kustomize/hub-router/overlays/local/kustomization.yaml +++ b/mediator/kustomize/mediator/overlays/local/kustomization.yaml @@ -13,7 +13,7 @@ # Note that it should also match with the prefix (text before '-') of the namespace # field above. commonLabels: - component: hub-router + component: mediator group: core instance: local project: trustbloc @@ -26,48 +26,54 @@ secretGenerator: - files: - certs/tls.crt - certs/tls.key - name: router-wildcard-cert + name: mediator-wildcard-cert type: kubernetes.io/tls configMapGenerator: - behavior: merge envs: - config.env - name: router-env + name: mediator-env - files: - certs/ca.crt - name: router-ca-cert + name: mediator-ca-cert replacements: -- path: router/replacements.yml -- path: router-api/replacements.yml -- path: router-ws/replacements.yml +- path: mediator/replacements.yml + source: null + targets: null +- path: mediator-api/replacements.yml + source: null + targets: null +- path: mediator-ws/replacements.yml + source: null + targets: null - source: kind: Secret - name: router-wildcard-cert + name: mediator-wildcard-cert version: v1 targets: - fieldPaths: - spec.tls.0.secretName select: kind: Ingress - name: router + name: mediator - fieldPaths: - spec.tls.0.secretName select: kind: Ingress - name: router-api + name: mediator-api - fieldPaths: - spec.tls.0.secretName select: kind: Ingress - name: router-ws + name: mediator-ws resources: - ../common -- router/ingress.yml -- router-api/ingress.yml -- router-ws/ingress.yml +- mediator/ingress.yml +- mediator-api/ingress.yml +- mediator-ws/ingress.yml transformers: - sedtransform.yml diff --git a/hub-router/kustomize/hub-router/overlays/local/router-api/ingress.yml b/mediator/kustomize/mediator/overlays/local/mediator-api/ingress.yml similarity index 68% rename from hub-router/kustomize/hub-router/overlays/local/router-api/ingress.yml rename to mediator/kustomize/mediator/overlays/local/mediator-api/ingress.yml index 19fed4bb..eb417edf 100644 --- a/hub-router/kustomize/hub-router/overlays/local/router-api/ingress.yml +++ b/mediator/kustomize/mediator/overlays/local/mediator-api/ingress.yml @@ -9,24 +9,24 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: - name: router-ws + name: mediator-ws labels: - app: router - component: hub-router + app: mediator + component: mediator group: core spec: tls: - hosts: - - ROUTER_WS_SERVICE_NAME.||DOMAIN|| + - mediator_WS_SERVICE_NAME.||DOMAIN|| secretName: INGRESS_TLS_SECRET rules: - - host: ROUTER_WS_SERVICE_NAME.||DOMAIN|| + - host: mediator_WS_SERVICE_NAME.||DOMAIN|| http: paths: - pathType: Prefix path: "/" backend: service: - name: ROUTER_WS_SERVICE_NAME + name: mediator_WS_SERVICE_NAME port: name: http diff --git a/hub-router/kustomize/hub-router/overlays/local/router-api/replacements.yml b/mediator/kustomize/mediator/overlays/local/mediator-api/replacements.yml similarity index 79% rename from hub-router/kustomize/hub-router/overlays/local/router-api/replacements.yml rename to mediator/kustomize/mediator/overlays/local/mediator-api/replacements.yml index 85cc02be..ae6ff659 100644 --- a/hub-router/kustomize/hub-router/overlays/local/router-api/replacements.yml +++ b/mediator/kustomize/mediator/overlays/local/mediator-api/replacements.yml @@ -1,6 +1,6 @@ source: kind: Service - name: router-ws + name: mediator-ws version: v1 targets: - fieldPaths: @@ -10,9 +10,9 @@ targets: delimiter: . select: kind: Ingress - name: router-ws + name: mediator-ws - fieldPaths: - spec.rules.0.http.paths.0.backend.service.name select: kind: Ingress - name: router-ws + name: mediator-ws diff --git a/hub-router/kustomize/hub-router/overlays/local/router-ws/ingress.yml b/mediator/kustomize/mediator/overlays/local/mediator-ws/ingress.yml similarity index 67% rename from hub-router/kustomize/hub-router/overlays/local/router-ws/ingress.yml rename to mediator/kustomize/mediator/overlays/local/mediator-ws/ingress.yml index 77eec8ca..63544f69 100644 --- a/hub-router/kustomize/hub-router/overlays/local/router-ws/ingress.yml +++ b/mediator/kustomize/mediator/overlays/local/mediator-ws/ingress.yml @@ -8,24 +8,24 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: router-api + name: mediator-api labels: - app: router - component: hub-router + app: mediator + component: mediator group: core spec: tls: - hosts: - - ROUTER_API_SERVICE_NAME.||DOMAIN|| + - mediator_API_SERVICE_NAME.||DOMAIN|| secretName: INGRESS_TLS_SECRET rules: - - host: ROUTER_API_SERVICE_NAME.||DOMAIN|| + - host: mediator_API_SERVICE_NAME.||DOMAIN|| http: paths: - pathType: Prefix path: "/" backend: service: - name: ROUTER_API_SERVICE_NAME + name: mediator_API_SERVICE_NAME port: name: http diff --git a/hub-router/kustomize/hub-router/overlays/local/router-ws/replacements.yml b/mediator/kustomize/mediator/overlays/local/mediator-ws/replacements.yml similarity index 79% rename from hub-router/kustomize/hub-router/overlays/local/router-ws/replacements.yml rename to mediator/kustomize/mediator/overlays/local/mediator-ws/replacements.yml index b18fa700..36bfef6d 100644 --- a/hub-router/kustomize/hub-router/overlays/local/router-ws/replacements.yml +++ b/mediator/kustomize/mediator/overlays/local/mediator-ws/replacements.yml @@ -1,6 +1,6 @@ source: kind: Service - name: router-api + name: mediator-api version: v1 targets: - fieldPaths: @@ -10,9 +10,9 @@ targets: delimiter: . select: kind: Ingress - name: router-api + name: mediator-api - fieldPaths: - spec.rules.0.http.paths.0.backend.service.name select: kind: Ingress - name: router-api + name: mediator-api diff --git a/hub-router/kustomize/hub-router/overlays/local/router/ingress.yml b/mediator/kustomize/mediator/overlays/local/mediator/ingress.yml similarity index 68% rename from hub-router/kustomize/hub-router/overlays/local/router/ingress.yml rename to mediator/kustomize/mediator/overlays/local/mediator/ingress.yml index 26b30c7b..a38f58c8 100644 --- a/hub-router/kustomize/hub-router/overlays/local/router/ingress.yml +++ b/mediator/kustomize/mediator/overlays/local/mediator/ingress.yml @@ -8,24 +8,24 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: router + name: mediator labels: - app: router - component: hub-router + app: mediator + component: mediator group: core spec: tls: - hosts: - - ROUTER_SERVICE_NAME.||DOMAIN|| + - mediator_SERVICE_NAME.||DOMAIN|| secretName: INGRESS_TLS_SECRET rules: - - host: ROUTER_SERVICE_NAME.||DOMAIN|| + - host: mediator_SERVICE_NAME.||DOMAIN|| http: paths: - pathType: Prefix path: "/" backend: service: - name: ROUTER_SERVICE_NAME + name: mediator_SERVICE_NAME port: name: http diff --git a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/replacements.yml b/mediator/kustomize/mediator/overlays/local/mediator/replacements.yml similarity index 82% rename from hub-auth/kustomize/hub-auth/overlays/local/hub-auth/replacements.yml rename to mediator/kustomize/mediator/overlays/local/mediator/replacements.yml index 6c751262..ae5a7f3b 100644 --- a/hub-auth/kustomize/hub-auth/overlays/local/hub-auth/replacements.yml +++ b/mediator/kustomize/mediator/overlays/local/mediator/replacements.yml @@ -1,6 +1,6 @@ source: kind: Service - name: hub-auth + name: mediator version: v1 targets: - fieldPaths: @@ -10,9 +10,9 @@ targets: delimiter: . select: kind: Ingress - name: hub-auth + name: mediator - fieldPaths: - spec.rules.0.http.paths.0.backend.service.name select: kind: Ingress - name: hub-auth + name: mediator diff --git a/hub-router/kustomize/hub-router/overlays/local/sedb64transform.yml b/mediator/kustomize/mediator/overlays/local/sedb64transform.yml similarity index 100% rename from hub-router/kustomize/hub-router/overlays/local/sedb64transform.yml rename to mediator/kustomize/mediator/overlays/local/sedb64transform.yml diff --git a/hub-router/kustomize/hub-router/overlays/local/sedtransform.yml b/mediator/kustomize/mediator/overlays/local/sedtransform.yml similarity index 100% rename from hub-router/kustomize/hub-router/overlays/local/sedtransform.yml rename to mediator/kustomize/mediator/overlays/local/sedtransform.yml diff --git a/hub-router/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer b/mediator/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer similarity index 100% rename from hub-router/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer rename to mediator/kustomize/plugin/svceng/sedb64transformer/SedB64Transformer diff --git a/hub-router/kustomize/plugin/svceng/sedtransformer/SedTransformer b/mediator/kustomize/plugin/svceng/sedtransformer/SedTransformer similarity index 100% rename from hub-router/kustomize/plugin/svceng/sedtransformer/SedTransformer rename to mediator/kustomize/plugin/svceng/sedtransformer/SedTransformer diff --git a/hub-router/scripts/generate_test_certs.sh b/mediator/scripts/generate_test_certs.sh similarity index 100% rename from hub-router/scripts/generate_test_certs.sh rename to mediator/scripts/generate_test_certs.sh diff --git a/scripts/deploy_all.sh b/scripts/deploy_all.sh index 1bac1f05..0b5a45f8 100755 --- a/scripts/deploy_all.sh +++ b/scripts/deploy_all.sh @@ -15,7 +15,7 @@ set -e : ${DEPLOYMENT_ENV:=local} ## Should be deployed in the listed order -: ${COMPONENTS=edv kms vct orb resolver csh vcs vault-server hub-auth hub-router wallet-web adapter-issuer adapter-rp} +: ${COMPONENTS=edv kms vct orb resolver csh vcs vault-server auth mediator wallet-web adapter-issuer adapter-rp} DEPLOY_LIST=( $COMPONENTS ) ## Map: component --> healthcheck(s) @@ -29,8 +29,8 @@ declare -A HEALTCHECK_URL=( [vcs]="https://issuer-vcs.$DOMAIN/healthcheck https://verifier-vcs.$DOMAIN/healthcheck https://holder-vcs.$DOMAIN/healthcheck" [vault-server]="https://vault-server.$DOMAIN/healthcheck" [kms]="https://vault-kms.$DOMAIN/healthcheck" - [hub-auth]="https://hub-auth.$DOMAIN/healthcheck" - [hub-router]="https://router-api.$DOMAIN/healthcheck" + [auth]="https://auth.$DOMAIN/healthcheck" + [mediator]="https://mediator-api.$DOMAIN/healthcheck" [wallet-web]="https://wallet.$DOMAIN/healthcheck" [adapter-issuer]="https://adapter-issuer.$DOMAIN/healthcheck" [adapter-rp]="https://adapter-rp.$DOMAIN/healthcheck" @@ -50,8 +50,8 @@ declare -A HEALTHCHECK_CODE=( [https://vault-server.$DOMAIN/healthcheck]=200 [https://csh.$DOMAIN/healthcheck]=200 [https://vault-kms.$DOMAIN/healthcheck]=200 - [https://router-api.$DOMAIN/healthcheck]=200 - [https://hub-auth.$DOMAIN/healthcheck]=200 + [https://mediator-api.$DOMAIN/healthcheck]=200 + [https://auth.$DOMAIN/healthcheck]=200 [https://wallet.$DOMAIN/healthcheck]=200 [https://adapter-rp.$DOMAIN/healthcheck]=200 [https://adapter-issuer.$DOMAIN/healthcheck]=200 diff --git a/scripts/service_list.txt b/scripts/service_list.txt index a3bef0b9..b572c3f2 100644 --- a/scripts/service_list.txt +++ b/scripts/service_list.txt @@ -1,27 +1,27 @@ adapter-hydra adapter-hydra-admin -adapter-issuer-didcomm adapter-issuer -adapter-rp-didcomm +adapter-issuer-didcomm adapter-rp +adapter-rp-didcomm +auth csh did-resolver edv holder-vcs -hub-auth -hydra-admin hydra +hydra-admin issuer-vcs -router-api -router -router-ws -orb-driver +mediator +mediator-api +mediator-ws orb-1 -vct orb-2 +orb-driver +static-file-server uni-resolver-web vault-kms vault-server +vct verifier-vcs wallet -static-file-server diff --git a/wallet-web/kustomize/wallet-web/overlays/common/config.env b/wallet-web/kustomize/wallet-web/overlays/common/config.env index f7f6cee9..0a26f709 100644 --- a/wallet-web/kustomize/wallet-web/overlays/common/config.env +++ b/wallet-web/kustomize/wallet-web/overlays/common/config.env @@ -8,7 +8,7 @@ HTTP_RESOLVER_URL=orb@https://did-resolver.||DOMAIN||/1.0/identifiers,v1@https:/ AGENT_DEFAULT_LABEL=user-agent LOG_LEVEL=WARNING BLOC_DOMAIN=||BLOC_DOMAIN|| -WALLET_MEDIATOR_URL=https://router-api.||DOMAIN|| +WALLET_MEDIATOR_URL=https://mediator-api.||DOMAIN|| BLINDED_ROUTING=true STORAGE_TYPE=edv EDV_SERVER_URL=https://edv.||DOMAIN||/encrypted-data-vaults @@ -18,7 +18,7 @@ USE_EDV_CACHE=true EDV_CLEAR_CACHE=10m USE_EDV_BATCH=true DID_ANCHOR_ORIGIN=https://orb-1.||DOMAIN|| -HTTP_SERVER_HUB_AUTH_URL=https://hub-auth.||DOMAIN|| +HTTP_SERVER_HUB_AUTH_URL=https://auth.||DOMAIN|| STATIC_ASSETS_URL=https://wallet.||DOMAIN|| WALLET_WEB_URL=https://wallet.||DOMAIN|| # TODO https://github.com/trustbloc/wallet/issues/1034 Revisit logic to Load json-ld contexts during startup