Merge branch 'main' of https://github.com/Z-100/soemi-weather

Author: Flurin

.github/workflows/azure-kubernetes-service.yml

@@ -25,14 +25,14 @@ jobs:
 
       - name: Get Short Commit SHA
         run: |
-          echo "COMMIT_SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-7)"
           echo "COMMIT_SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
 
       - name: Build docker images
         run: |
           echo "Building images"
           docker build -t z100/soemi-woeb:${{ env.COMMIT_SHA_SHORT }} ./soemi-woeb
           docker build -t z100/soemi-woers:${{ env.COMMIT_SHA_SHORT }} ./soemi-woers
+          docker build -t z100/soemi-proexy:${{ env.COMMIT_SHA_SHORT }} ./soemi-proexy
 
       - name: Push docker images
         run: |
@@ -42,6 +42,7 @@ jobs:
           echo "Pushing images"
           docker push z100/soemi-woeb:${{ env.COMMIT_SHA_SHORT }}
           docker push z100/soemi-woers:${{ env.COMMIT_SHA_SHORT }}
+          docker push z100/soemi-proexy:${{ env.COMMIT_SHA_SHORT }}
 
   deploy-services:
     permissions:
@@ -57,13 +58,13 @@ jobs:
 
       - name: Get Short Commit SHA
         run: |
-          echo "COMMIT_SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-7)"
           echo "COMMIT_SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
 
       - name: Populate deployment.yaml with vars
         run: |
           sed -i "s|\$IMAGE_TAG|${{ env.COMMIT_SHA_SHORT }}|g" ./soemi-woeb/k8s/deployment.yaml
           sed -i "s|\$IMAGE_TAG|${{ env.COMMIT_SHA_SHORT }}|g" ./soemi-woers/k8s/deployment.yaml
+          sed -i "s|\$IMAGE_TAG|${{ env.COMMIT_SHA_SHORT }}|g" ./soemi-proexy/k8s/deployment.yaml
 
       - name: Azure login
         uses: azure/login@v1.4.6
@@ -86,5 +87,23 @@ jobs:
       - name: Deploy microservices to AKS
         run: |
           echo "Deploying services"
+          kubectl replace --force -f ./soemi-moen/k8s
+          kubectl replace --force -f ./soemi-proexy/k8s
           kubectl replace --force -f ./soemi-woeb/k8s
           kubectl replace --force -f ./soemi-woers/k8s
+
+      - name: Deploy process into camunda
+        run: |
+          echo "Sleeping for 10 to wait for pod"
+          sleep 10
+
+          echo "Forwarding port"
+          camundaPod=$(kubectl get pods | grep 'soemi-moen' | awk '{print $1}')
+          kubectl port-forward $camundaPod 8080:8080 &
+          sleep 5
+          
+          echo "Deploying camunda bpmn into pod"
+          curl -w "\n" -H "Content-Type: multipart/form-data" -F "deployment-name=soemi-moen-bpmn" -F "enable-duplicate-filtering=true" -F "deploy-changed-only=true" -F "deployment-source=process application" -F "data=@./soemi-moen/soemi-moen.bpmn" http://localhost:8080/engine-rest/deployment/create
+
+          echo "Killing port-forwarding"
+          pkill -f "kubectl port-forward"

k8s/common/kubeconfig.yaml

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: soemi-moen
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: soemi-moen
+  template:
+    metadata:
+      labels:
+        app: soemi-moen
+    spec:
+      containers:
+        - name: soemi-moen
+          image: camunda/camunda-bpm-platform:run-latest
+          ports:
+            - containerPort: 8080

k8s/common/secrets.yaml

@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: soemi-moen-ingress
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/rewrite-target: /camunda/$2
+spec:
+  rules:
+    - host: xn--smi-weather-rfb.ch
+      http:
+        paths:
+          - path: /moen(|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: soemi-moen
+                port:
+                  number: 8080

k8s/ingress/ingress-controller-deployment.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: soemi-moen
+  labels:
+    app: soemi-moen
+spec:
+  type: ClusterIP
+  selector:
+    app: soemi-moen
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+      name: http

k8s/ingress/ingress-controller-service.yaml

@@ -0,0 +1,2 @@
+FROM nginx
+COPY nginx.conf ./nginx.conf

k8s/namespace.yaml

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: soemi-proexy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: soemi-proexy
+  template:
+    metadata:
+      labels:
+        app: soemi-proexy
+    spec:
+      containers:
+        - name: soemi-proexy
+          image: z100/soemi-proexy:$IMAGE_TAG
+          ports:
+            - containerPort: 8080

soemi-moen/k8s/deployment.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: soemi-proexy
+spec:
+  selector:
+    app: soemi-proexy
+  type: ClusterIP
+  ports:
+    - port: 8080
+      targetPort: 8080

soemi-moen/k8s/ingress.yaml

@@ -0,0 +1,11 @@
+events {}
+
+http {
+    server {
+        listen 8080;
+
+        location /api {
+            proxy_pass http://soemi-woers:8089/;
+        }
+    }
+}