Merge pull request #80 from AET-DevOps25/workflow/enhance-cicd-and-helm-configurations

feat: enhance CI/CD workflows through terraform and pre-prod, prod namespaces deploy fix

Author: DostavalovID

.github/workflows/client.yml

@@ -1,128 +1,93 @@
-name: check format for React App
-
-on:
-  push:
-    paths:
-      - "client/**"
-  pull_request:
-    paths:
-      - "client/**"
-
-jobs:
-  client-check-format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: Install dependencies (Client)
-        working-directory: ./client
-        run: npm ci
-
-      - name: Run ESLint on changed files
-        continue-on-error: true
-        working-directory: ./client
-        run: |
-          changed_files=$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | grep -E '\.(js|jsx|ts|tsx)$' | sed 's|^client/||' || true)
-
-          if [ -n "$changed_files" ]; then
-            echo "Running ESLint on changed files:"
-            echo "$changed_files"
-            npx eslint $changed_files
-          else
-            echo "No JavaScript/TypeScript files changed"
-          fi
-
-  client-run-tests:
-    runs-on: ubuntu-latest
-    needs: client-check-format
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: Install dependencies
-        working-directory: ./client
-        run: npm ci
-
-      - name: Run tests
-        working-directory: ./client
-        run: npm test
-
-  client-docker-build-push:
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-    runs-on: ubuntu-latest
-    needs: [client-check-format, client-run-tests]
-    permissions:
-      packages: write
-      contents: read
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./client
-          file: ./client/Dockerfile
-          push: true
-          tags: |
-            ghcr.io/aet-devops25/team-cache-me-if-you-can/client:latest
-            ghcr.io/aet-devops25/team-cache-me-if-you-can/client:${{ github.sha }}
-          labels: |
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.revision=${{ github.sha }}
-
-  client-deploy:
-    name: Deploy to Kubernetes
-    runs-on: ubuntu-latest
-    needs: [client-check-format, client-run-tests, client-docker-build-push]
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set up Terraform
-        uses: hashicorp/setup-terraform@v3
-
-      - name: Set up Kubernetes tools
-        uses: azure/setup-kubectl@v3
-
-      - name: Configure kubeconfig
-        run: |
-          mkdir -p ~/.kube
-          echo "${{ secrets.KUBE_CONFIG_DATA }}" > ~/.kube/config
-          chmod 600 ~/.kube/config
-
-      - name: Terraform Init
-        run: terraform init
-        working-directory: ./client/terraform
-
-      - name: Terraform Plan
-        run: terraform plan -var="redeploy_id=${{ github.sha }}"
-        working-directory: ./client/terraform
-
-      - name: Terraform Apply
-        run: terraform apply -auto-approve -var="redeploy_id=${{ github.sha }}"
-        working-directory: ./client/terraform
-        env:
-          KUBECONFIG: $HOME/.kube/config
+name: Client Code Quality & Testing
+
+on:
+  push:
+    branches: ['**']
+    paths:
+      - "client/**"
+  pull_request:
+    branches: ['**']
+    paths:
+      - "client/**"
+
+jobs:
+  client-check-format:
+    name: Code Quality Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install dependencies (Client)
+        working-directory: ./client
+        run: npm ci
+
+      - name: Run ESLint on changed files
+        continue-on-error: true
+        working-directory: ./client
+        run: |
+          changed_files=$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | grep -E '\.(js|jsx|ts|tsx)$' | sed 's|^client/||' || true)
+
+          if [ -n "$changed_files" ]; then
+            echo "Running ESLint on changed files:"
+            echo "$changed_files"
+            npx eslint $changed_files
+          else
+            echo "No JavaScript/TypeScript files changed"
+          fi
+
+      - name: Check TypeScript compilation
+        working-directory: ./client
+        run: npx tsc --noEmit
+
+  client-run-tests:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    needs: client-check-format
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install dependencies
+        working-directory: ./client
+        run: npm ci
+
+      - name: Run tests
+        working-directory: ./client
+        run: npm test
+
+      - name: Run build test
+        working-directory: ./client
+        run: npm run build
+
+  deployment-notice:
+    name: Deployment Information
+    runs-on: ubuntu-latest
+    needs: [client-check-format, client-run-tests]
+    if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
+    steps:
+      - name: Show deployment info
+        run: |
+          echo "ℹ️ **Client Deployment Information**"
+          echo ""
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            echo "🔄 **Pull Request detected**"
+            echo "- Client will be deployed to **pre-prod** environment"
+            echo "- Deployment handled by unified server-ci-cd.yml pipeline"
+            echo "- URL: https://cache-me-if-you-can-client-pre-prod.team-cache-me-if-you-can.student.k8s.aet.cit.tum.de"
+          elif [ "${{ github.ref }}" = "refs/heads/main" ]; then
+            echo "🚀 **Main branch push detected**"
+            echo "- Client will be deployed to **prod** environment"
+            echo "- Deployment handled by unified server-ci-cd.yml pipeline"
+            echo "- URL: https://cache-me-if-you-can-client-prod.team-cache-me-if-you-can.student.k8s.aet.cit.tum.de"
+          fi

.github/workflows/docker-publish-genai.yml

@@ -6,6 +6,9 @@ on:
       - main
     paths:
       - 'genai/**'
+      - 'helm/genai-chart/**'
+      - 'infra/**'
+      - '.github/workflows/genai-ci-cd.yml'
 
 jobs:
   build-and-push-image:

.github/workflows/genai-ci-cd.yml

@@ -1,18 +1,17 @@
-name: Genai CI/CD Pipeline
+name: Genai CI/CD Pipeline - DISABLED (moved to unified pipeline)
+
+# This workflow has been moved to server-ci-cd.yml (now unified-ci-cd.yml)
+# Keeping this file as backup for reference
 
 on:
-  push:
-    branches:
-      - '**' # Runs on push to any branch
-  pull_request:
-    branches:
-      - main # Runs on pull requests targeting main (for tests before merge)
+  # Disabled - remove automatic triggers
+  workflow_dispatch: # Can only be triggered manually
 
 jobs:
   test:
     name: Run Pytest
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' || github.event_name == 'pull_request' # Ensure it runs for both pushes and PRs
+    if: false # Disabled
 
     steps:
       - name: Check out code
@@ -33,7 +32,7 @@ jobs:
     name: Deploy to Development
     runs-on: ubuntu-latest
     needs: test
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+    if: false # Disabled
 
     steps:
       - name: Check out code
@@ -48,40 +47,29 @@ jobs:
       - name: Setup Helm
         uses: azure/setup-helm@v4
 
+      - name: Wait for server infrastructure
+        run: |
+          echo "Waiting for server infrastructure to be ready..."
+          timeout=300
+          while [ $timeout -gt 0 ]; do
+            if kubectl get secret openai-credentials -n pre-prod >/dev/null 2>&1; then
+              echo "✅ Infrastructure ready - OpenAI secret found"
+              break
+            fi
+            echo "⏳ Waiting for infrastructure... ($timeout seconds remaining)"
+            sleep 10
+            timeout=$((timeout-10))
+          done
+          
+          if [ $timeout -le 0 ]; then
+            echo "❌ Timeout waiting for infrastructure"
+            exit 1
+          fi
+
       - name: Deploy to Kubernetes with Helm
         run: |
+          # Deploy with Helm (infrastructure should have created openai-credentials secret)
           helm upgrade --install genai-dev ./helm/genai-chart \
-            --namespace developmentv1 --create-namespace \
+            --namespace devel --create-namespace \
             -f ./helm/genai-chart/values-development.yaml \
-            --set image.tag=${{ github.sha }}
-
-  # deploy_preprod:
-  #   name: Deploy to Pre-production
-  #   runs-on: ubuntu-latest
-  #   needs: test
-  #   if: startsWith(github.ref, 'refs/tags/v') # Example: trigger on tags like v1.2.3
-  #
-  #   steps:
-  #   ... (similar to deploy_dev)
-  #   - name: Deploy to Kubernetes with Helm
-  #     run: |
-  #       helm upgrade --install genai-preprod ./genai/helm/genai-chart \
-  #         --namespace preprod --create-namespace \
-  #         -f ./genai/helm/genai-chart/values-preprod.yaml \
-  #         --set image.tag=${{ github.ref_name }} # Use tag as image version
-  #
-  # deploy_prod:
-  #   name: Deploy to Production
-  #   runs-on: ubuntu-latest
-  #   needs: deploy_preprod # Chain deployments
-  #   environment: production # Use GitHub environments for protection rules
-  #   if: startsWith(github.ref, 'refs/tags/v')
-  #
-  #   steps:
-  #   ... (similar to deploy_dev)
-  #   - name: Deploy to Kubernetes with Helm
-  #     run: |
-  #       helm upgrade --install genai-prod ./genai/helm/genai-chart \
-  #         --namespace prod --create-namespace \
-  #         -f ./genai/helm/genai-chart/values-prod.yaml \
-  #         --set image.tag=${{ github.ref_name }} 
+            --set image.tag=latest