test: k3s deploy action

depromeet · Aug 27, 2024 · 84f1f2a · 84f1f2a
1 parent 7c6500a
commit 84f1f2a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 47 deletions.
diff --git a/.github/workflows/k3s-dev.yaml b/.github/workflows/k3s-dev.yaml
@@ -3,7 +3,7 @@ name: Spring Boot Multi-module K3s Deployment
 on:
   push:
     branches:
-      - develop-temp
+      - develop
 
 env:
   REGISTRY: "ghcr.io"
@@ -172,6 +172,7 @@ jobs:
 
       - name: Create K3s deployment files
         run: |
+          TARGET=${{ env.DEPLOY_TARGET}}
           for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do
             if [ "$MODULE" = "layer-api" ]; then
               PORT=8080
@@ -185,22 +186,22 @@ jobs:
           apiVersion: apps/v1
           kind: Deployment
           metadata:
-            name: $MODULE-deployment
+            name: $MODULE-$TARGET
             namespace: default
             labels:
-              app: $MODULE
+              app: $MODULE-$TARGET
           spec:
             replicas: 1
             selector:
               matchLabels:
-                app: $MODULE
+                app: $MODULE-$TARGET
             template:
               metadata:
                 labels:
-                  app: $MODULE
+                  app: $MODULE-$TARGET
               spec:
                 containers:
-                  - name: $MODULE
+                  - name: $MODULE-$TARGET
                     image: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }}
                     ports:
                       - containerPort: $PORT
@@ -231,44 +232,18 @@ jobs:
           apiVersion: v1
           kind: Service
           metadata:
-            name: $MODULE-service
+            name: $MODULE-service-$TARGET
             namespace: default
             labels:
-              app: $MODULE
+              app: $MODULE-$TARGET
           spec:
             selector:
-              app: $MODULE
+              app: $MODULE-$TARGET
             ports:
             - protocol: TCP
               port: 80
               targetPort: $PORT
           EOF
-
-            if [ "$MODULE" = "layer-api" ]; then
-              echo "layer-api processed"
-              cat <<EOF >> deployment-$MODULE.yaml
-          ---
-          apiVersion: networking.k8s.io/v1
-          kind: Ingress
-          metadata:
-            name: layer-api-ingress
-            namespace: default
-            annotations:
-              kubernetes.io/ingress.class: traefik
-          spec:
-            rules:
-              - host: stgapi.layerapp.io
-                http:
-                  paths:
-                    - path: /
-                      pathType: Prefix
-                      backend:
-                        service:
-                          name: layer-api-service
-                          port:
-                            number: 80
-          EOF
-            fi
           done
 
 

diff --git a/.github/workflows/k3s-prod.yaml b/.github/workflows/k3s-prod.yaml
@@ -3,7 +3,7 @@ name: Spring Boot Multi-module K3s Deployment
 on:
   push:
     branches:
-      - develop
+      - main
 
 env:
   REGISTRY: "ghcr.io"
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Env
         id: set-env
         run: |
-          if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then
+          if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
             echo "DEPLOY_TARGET=production" >> $GITHUB_OUTPUT
           else
             echo "DEPLOY_TARGET=development" >> $GITHUB_OUTPUT
@@ -166,27 +166,28 @@ jobs:
 
       - name: Create K3s deployment files
         run: |
+          TARGET=${{ env.DEPLOY_TARGET}}
           for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do
             cat <<EOF > deployment-$MODULE.yaml
           apiVersion: apps/v1
           kind: Deployment
           metadata:
-            name: $MODULE-production
+            name: $MODULE-$TARGET
             namespace: default
             labels:
-              app: $MODULE-production
+              app: $MODULE-$TARGET
           spec:
             replicas: 1
             selector:
               matchLabels:
-                app: $MODULE-production
+                app: $MODULE-$TARGET
             template:
               metadata:
                 labels:
-                  app: $MODULE-production
+                  app: $MODULE-$TARGET
               spec:
                 containers:
-                  - name: $MODULE-production
+                  - name: $MODULE-$TARGET
                     image: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }}
                     ports:
                       - containerPort: 8080
@@ -206,24 +207,24 @@ jobs:
                 volumes:
                   - name: secret-volume
                     secret:
-                      secretName: app-secret-dev
+                      secretName: app-secret-prod
                   - name: log-volume
                     hostPath:
                       path: /${{ env.DEPLOY_TARGET }}/log/$MODULE
                       type: DirectoryOrCreate
                   - name: tokens-volume
-                    emptyDir: { }
+                    emptyDir: {}
           ---
           apiVersion: v1
           kind: Service
           metadata:
-            name: $MODULE-service-production
+            name: $MODULE-service-$TARGET
             namespace: default
             labels:
-              app: $MODULE-production
+              app: $MODULE-$TARGET
           spec:
             selector:
-              app: $MODULE-production
+              app: $MODULE-$TARGET
             ports:
               - protocol: TCP
                 port: 80