Update and correct Service URLs in Config (#1413)

openintegrationhub · Apr 19, 2022 · bd82585 · bd82585
1 parent 23afbc5
commit bd82585
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/dev-tools/docker-compose/docker-compose.yml b/dev-tools/docker-compose/docker-compose.yml
@@ -131,7 +131,7 @@ services:
       COMPONENT_REPOSITORY_BASE_URL: http://${DEV_COMPONENT_REPOSITORY_FOLDER}:${DEV_COMPONENT_REPOSITORY_PORT}
 
       ### kubernetes pod -> minikube host
-      SECRETS_SERVICE_BASE_URL: http://${MINIKUBE_HOST_IP}:${DEV_SECRET_SERVICE_EXTERNAL_PORT}/api/v1
+      SECRET_SERVICE_BASE_URL: http://${MINIKUBE_HOST_IP}:${DEV_SECRET_SERVICE_EXTERNAL_PORT}/api/v1
       SNAPSHOTS_SERVICE_BASE_URL: http://${MINIKUBE_HOST_IP}:${DEV_SNAPSHOTS_SERVICE_EXTERNAL_PORT}
       SELF_URL: http://${MINIKUBE_HOST_IP}:${DEV_COMPONENT_ORCHESTRATOR_EXTERNAL_PORT}
       SELF_API_URI: http://${MINIKUBE_HOST_IP}:${DEV_COMPONENT_ORCHESTRATOR_EXTERNAL_PORT}

diff --git a/dev-tools/minikube/4-Services/component-orchestrator/containerDeploy.yaml b/dev-tools/minikube/4-Services/component-orchestrator/containerDeploy.yaml
@@ -25,9 +25,11 @@ spec:
         env:
         - name: COMPONENT_REPOSITORY_BASE_URL
           value: "http://component-repository.oih-dev-ns.svc.cluster.local:1234"
+        - name: IAM_BASE_URL
+          value: "http://iam.oih-dev-ns.svc.cluster.local:3099/api/v1"
         - name: SNAPSHOTS_SERVICE_BASE_URL
           value: "http://snapshots-service.oih-dev-ns.svc.cluster.local:1234"
-        - name: SECRET_SERVICE_URL
+        - name: SECRET_SERVICE_BASE_URL
           value: "http://secret-service.oih-dev-ns.svc.cluster.local:3000/api/v1"
         - name: ATTACHMENT_STORAGE_SERVICE_BASE_URL
           value: "http://attachment-storage-service.oih-dev-ns.svc.cluster.local:3002"

diff --git a/dev-tools/minikube/4-Services/component-orchestrator/sourceDeploy.yaml b/dev-tools/minikube/4-Services/component-orchestrator/sourceDeploy.yaml
@@ -28,7 +28,9 @@ spec:
           env:
             - name: COMPONENT_REPOSITORY_BASE_URL
               value: "http://component-repository.oih-dev-ns.svc.cluster.local:1234"
-            - name: SECRETS_SERVICE_BASE_URL
+            - name: IAM_BASE_URL
+              value: "http://iam.oih-dev-ns.svc.cluster.local:3099/api/v1"
+            - name: SECRET_SERVICE_BASE_URL
               value: "http://secret-service.oih-dev-ns.svc.cluster.local:3000/api/v1"
             - name: "INTROSPECT_ENDPOINT_BASIC"
               value: "http://iam.oih-dev-ns.svc.cluster.local:3099/api/v1/tokens/introspect"

diff --git a/services/component-orchestrator/README.md b/services/component-orchestrator/README.md
@@ -84,6 +84,7 @@ kubectl apply -f ./k8s
 | ----------------------------------- | ------------------------------------------------------------------------------------------- |
 | ORCHESTRATOR_TOKEN_SECRET           | Will be used to sign orchestrator tokens.                                                   |
 | COMPONENT_REPOSITORY_BASE_URL       | Base URL of the Component Repository.                                                       |
+| IAM_BASE_URL                        | Base URL to access the IAM service.                        |
 | LISTEN_PORT                         | Port for HTTP interface.                                                                    |
 | LOG_LEVEL                           | Log level for logger.                                                                       |
 | MONGODB_URI                         | MongoDB connection string.                                                                  |

diff --git a/services/component-orchestrator/k8s/config/configmap.yaml b/services/component-orchestrator/k8s/config/configmap.yaml
@@ -6,12 +6,13 @@ metadata:
 data:
   ATTACHMENT_STORAGE_SERVICE_BASE_URL: "http://attachment-storage-service.oih-dev-ns.svc.cluster.local:3002"
   COMPONENT_REPOSITORY_BASE_URL: "http://component-repository-service.oih-dev-ns.svc.cluster.local:1234"
+  IAM_BASE_URL: "http://iam.oih-dev-ns.svc.cluster.local:3099/api/v1/"
   LISTEN_PORT: "1234"
   LOG_LEVEL: trace
   RABBITMQ_MANAGEMENT_URI: "http://guest:guest@rabbitmq-service.oih-dev-ns.svc.cluster.local:15672/"
   RABBITMQ_URI: "amqp://guest:guest@rabbitmq-service.oih-dev-ns.svc.cluster.local"
   RABBITMQ_URI_FLOWS: "amqp://rabbitmq-service.oih-dev-ns.svc.cluster.local"
-  SECRET_SERVICE_URL: "http://secret-service.oih-dev-ns.svc.cluster.local:3000/api/v1"
+  SECRET_SERVICE_BASE_URL: "http://secret-service.oih-dev-ns.svc.cluster.local:3000/api/v1"
   SELF_URL: "http://api-service.oih-dev-ns.svc.cluster.local"
   SNAPSHOTS_SERVICE_BASE_URL: "http://snapshots-service.oih-dev-ns.svc.cluster.local:1234"
   DATAHUB_BASE_URL: "http://snapshots-service.oih-dev-ns.svc.cluster.local:1234"