Remove /minikube and update dev minikube scripting (#1340)

* Add external npm install * Update source deployments. Fix error in IAM package.json * Update documentation for removeal of /minikube folder and to reflect improvements in Apple Silicon support
openintegrationhub · Oct 28, 2021 · 2f796e7 · 2f796e7
1 parent e8b1354
commit 2f796e7
Show file tree

Hide file tree

Showing 77 changed files with 172 additions and 3,084 deletions.
diff --git a/dev-tools/README.md b/dev-tools/README.md
@@ -10,7 +10,7 @@ Visit the official [Open Integration Hub homepage](https://www.openintegrationhu
 
 This folder contains two methods of implementing a development environment locally to run the OIH framework.
 
-- The [/minikube folder](minikube/) is based off of the basic minikube installation found in the [root minikube folder](../minikube). It adds the ability to optionally launch each service using local source code served over NFS instead of the public Docker image.
+- The [/minikube folder](minikube/) provides the ability to deploy each service from its public Docker image or using local source code served over NFS. It is activated using the `setup.sh` script in the folder. 
 - The [/docker-compose folder](docker-compose/) contains configuration files and helper scripts to run local services directly from Docker. It still relies on minikube to execute flows.
 - The [/test-component folder](test-component/) contains a dynamic test component which could be used within the docker-compose approach
 

diff --git a/dev-tools/minikube/1-Platform/ingress.yaml b/dev-tools/minikube/1-Platform/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: oih-dev-ingress
@@ -10,90 +10,150 @@ spec:
   - host: iam.example.com
     http:
       paths:
-      - backend:
-          serviceName: iam
-          servicePort: 3099
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: iam
+            port: 
+              number: 3099
   - host: skm.example.com
     http:
       paths:
-      - backend:
-          serviceName: secret-service
-          servicePort: 3000
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: secret-service
+            port:
+              number: 3000
   - host: flow-repository.example.com
     http:
       paths:
-      - backend:
-          serviceName: flow-repository
-          servicePort: 3001
+      - path: /
+        pathType: Prefix
+        backend:
+          service: 
+            name: flow-repository
+            port:
+              number: 3001
   - host: template-repository.example.com
     http:
       paths:
-      - backend:
-          serviceName: template-repository
-          servicePort: 3001
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: template-repository
+            port:
+              number: 3001
   - host: auditlog.example.com
     http:
       paths:
-      - backend:
-          serviceName: audit-log
-          servicePort: 3007
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: audit-log
+            port:
+              number: 3007
   - host: metadata.example.com
     http:
       paths:
-      - backend:
-          serviceName: meta-data-repository
-          servicePort: 3000
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: meta-data-repository
+            port:
+              number: 3000
   - host: component-repository.example.com
     http:
       paths:
-      - backend:
-          serviceName: component-repository
-          servicePort: 1234
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: component-repository
+            port:
+              number: 1234
   - host: snapshots-service.example.com
     http:
       paths:
-      - backend:
-          serviceName: snapshots-service
-          servicePort: 1234
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: snapshots-service
+            port:
+              number: 1234
   - host: webhooks.example.com
     http:
       paths:
-      - backend:
-          serviceName: webhooks
-          servicePort: 1234
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: webhooks
+            port: 
+              number: 1234
   - host: web-ui.example.com
     http:
       paths:
-      - backend:
-          serviceName: web-ui
-          servicePort: 3000
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: web-ui
+            port:
+              number: 3000
   - host: attachment-storage-service.example.com
     http:
       paths:
-      - backend:
-          serviceName: attachment-storage-service
-          servicePort: 3002
+      - path: /
+        pathType: Prefix
+        backend:
+          service: 
+            name: attachment-storage-service
+            port:
+              number: 3002
   - host: data-hub.example.com
     http:
       paths:
-      - backend:
-          serviceName: data-hub-service
-          servicePort: 1234
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: data-hub-service
+            port:
+              number: 1234
   - host: ils.example.com
     http:
       paths:
-      - backend:
-          serviceName: ils
-          servicePort: 3003
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: ils
+            port:
+              number: 3003
   - host: app-directory.example.com
     http:
       paths:
-      - backend:
-          serviceName: app-directory
-          servicePort: 3000
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: app-directory
+            port:
+              number: 3000
   - host: dispatcher-service.example.com
     http:
       paths:
-      - backend:
-          serviceName: dispatcher-service
-          servicePort: 3013
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: dispatcher-service
+            port:
+              number: 3013
diff --git a/dev-tools/minikube/2-IAM/sourceDeploy.yaml b/dev-tools/minikube/2-IAM/sourceDeploy.yaml
@@ -17,7 +17,7 @@ spec:
         - name: iam
           image: node:16-alpine #openintegrationhub/iam:latest #
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/iam"]
           workingDir: /usr/src/app/
           ports:
             - containerPort: 3099
@@ -79,8 +79,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/iam
-              #readOnly: true
           livenessProbe:
             httpGet:
               port: 3099

diff --git a/dev-tools/minikube/4-Services/app-directory/sourceDeploy.yaml b/dev-tools/minikube/4-Services/app-directory/sourceDeploy.yaml
@@ -17,7 +17,7 @@ spec:
         - name: app-directory
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/app-directory"]
           workingDir: /usr/src/app/
           ports:
             - containerPort: 3000
@@ -51,8 +51,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/app-directory
-              #readOnly: true
             - name: RABBITMQ_URI
               value: "amqp://guest:guest@rabbitmq-service.oih-dev-ns.svc.cluster.local:5672"
           livenessProbe:

diff --git a/dev-tools/minikube/4-Services/attachment-storage-service/sourceDeploy.yaml b/dev-tools/minikube/4-Services/attachment-storage-service/sourceDeploy.yaml
@@ -22,7 +22,7 @@ spec:
         - name: attachment-storage-service
           image: node:16-alpine #openintegrationhub/iam:latest #
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/attachment-storage-service"]
           workingDir: /usr/src/app/
           env:
             - name: REDIS_CONFIG
@@ -44,7 +44,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/attachment-storage-service
           livenessProbe:
             httpGet:
               port: 3002

diff --git a/dev-tools/minikube/4-Services/audit-log/sourceDeploy.yaml b/dev-tools/minikube/4-Services/audit-log/sourceDeploy.yaml
@@ -17,7 +17,7 @@ spec:
         - name: audit-log
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/audit-log"]
           workingDir: /usr/src/app/
           ports:
             - containerPort: 3007
@@ -53,7 +53,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/audit-log
           livenessProbe:
             httpGet:
               port: 3007

diff --git a/dev-tools/minikube/4-Services/component-orchestrator/sourceDeploy.yaml b/dev-tools/minikube/4-Services/component-orchestrator/sourceDeploy.yaml
@@ -23,7 +23,7 @@ spec:
         - name: component-orchestrator
           image: node:16-alpine #openintegrationhub/iam:latest #
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/component-orchestrator"]
           workingDir: /usr/src/app/
           env:
             - name: COMPONENT_REPOSITORY_BASE_URL
@@ -62,7 +62,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/component-orchestrator
               #readOnly: true
           livenessProbe:
             httpGet:

diff --git a/dev-tools/minikube/4-Services/component-repository/sourceDeploy.yaml b/dev-tools/minikube/4-Services/component-repository/sourceDeploy.yaml
@@ -22,7 +22,7 @@ spec:
         - name: component-repository
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/component-repository"]
           workingDir: /usr/src/app/
           env:
             - name: MONGODB_URI
@@ -51,7 +51,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/component-repository
           livenessProbe:
             httpGet:
               port: 1234

diff --git a/dev-tools/minikube/4-Services/data-hub/sourceDeploy.yaml b/dev-tools/minikube/4-Services/data-hub/sourceDeploy.yaml
@@ -22,7 +22,7 @@ spec:
         - name: data-hub
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/data-hub"]
           workingDir: /usr/src/app/
           env:
             - name: MONGODB_URI
@@ -44,7 +44,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/data-hub
           livenessProbe:
             httpGet:
               port: 1234

diff --git a/dev-tools/minikube/4-Services/dispatcher-service/sourceDeploy.yaml b/dev-tools/minikube/4-Services/dispatcher-service/sourceDeploy.yaml
@@ -17,7 +17,7 @@ spec:
         - name: dispatcher-service
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/dispatcher-service"]
           workingDir: /usr/src/app/
           ports:
             - containerPort: 3013
@@ -58,7 +58,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/dispatcher-service
           livenessProbe:
             httpGet:
               port: 3013

diff --git a/dev-tools/minikube/4-Services/flow-repository/sourceDeploy.yaml b/dev-tools/minikube/4-Services/flow-repository/sourceDeploy.yaml
@@ -20,7 +20,7 @@ spec:
           args:
             [
               "-c",
-              "apk update && apk add --no-cache python && npm install --network-timeout 9000000 --non-interactive && npm start:container",
+              "npm run start:container -w services/flow-repository",
             ]
           workingDir: /usr/src/app/
           ports:
@@ -55,7 +55,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/flow-repository
           livenessProbe:
             httpGet:
               port: 3001

diff --git a/dev-tools/minikube/4-Services/ils/sourceDeploy.yaml b/dev-tools/minikube/4-Services/ils/sourceDeploy.yaml
@@ -17,7 +17,7 @@ spec:
         - name: ils
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/ils"]
           workingDir: /usr/src/app/
           ports:
             - containerPort: 3003
@@ -38,7 +38,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/ils
           livenessProbe:
             httpGet:
               port: 3003

diff --git a/dev-tools/minikube/4-Services/meta-data-repository/sourceDeploy.yaml b/dev-tools/minikube/4-Services/meta-data-repository/sourceDeploy.yaml
@@ -17,7 +17,7 @@ spec:
         - name: meta-data-repository
           image: node:16-alpine
           command: ["/bin/sh"]
-          args: ["-c", "npm install --non-interactive && npm start:container"]
+          args: ["-c", "npm run start:container -w services/meta-data-repository"]
           workingDir: /usr/src/app/
           ports:
             - containerPort: 3000
@@ -57,7 +57,6 @@ spec:
           volumeMounts:
             - name: code
               mountPath: /usr/src/app
-              subPath: services/meta-data-repository
           livenessProbe:
             httpGet:
               port: 3000