Merge pull request #1 from kebrahimpour/dev

Dev

.github/workflows/build-and-deploy.yaml

@@ -16,7 +16,11 @@ env:
 
 jobs:
   build-and-deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      packages: write
+
 
     steps:
       - name: Checkout code
@@ -38,12 +42,13 @@ jobs:
         run: |
           mkdir -p $HOME/.kube
           echo "${{ secrets.KUBECONFIG_BASE64 }}" | base64 -d > $HOME/.kube/config
+          chmod 600 ~/.kube/config
         shell: bash
 
       - name: Detect container name
         id: detect-container
         run: |
-          CONTAINER=$(kubectl -n $NAMESPACE get deployment homepage -o=jsonpath='{.spec.template.spec.containers[0].name}')
+          CONTAINER=$(kubectl -n $NAMESPACE get deployment landing-page -o=jsonpath='{.spec.template.spec.containers[0].name}')
           echo "container=$CONTAINER" >> $GITHUB_OUTPUT
         env:
           NAMESPACE: ${{ github.ref == 'refs/heads/main' && 'prod' || 'web' }}
@@ -53,7 +58,7 @@ jobs:
           IMAGE="ghcr.io/${{ github.repository }}:$VERSION"
           CONTAINER="${{ steps.detect-container.outputs.container }}"
           echo "Setting image for container $CONTAINER"
-          kubectl set image deployment/homepage $CONTAINER=$IMAGE -n $NAMESPACE
+          kubectl set image deployment/landing-page $CONTAINER=$IMAGE -n $NAMESPACE
         env:
           VERSION: ${{ vars.VERSION || 'latest' }}
           NAMESPACE: ${{ github.ref == 'refs/heads/main' && 'prod' || 'web' }}

.github/workflows/deploy.yaml

@@ -1,53 +0,0 @@
-# .github/workflows/deploy.yaml
-
-name: Build and Deploy to Kubernetes
-
-#on:
-#  push:
-#    branches: [ main ]
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Debug Variables
-        run: echo "Repository: ${{ github.repository }}"
-
-      - 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
-        run: |
-          IMAGE_NAME="ghcr.io/${{ github.repository }}"
-          docker build -t "$IMAGE_NAME:latest" .
-          docker push "$IMAGE_NAME:latest"
-        shell: bash
-
-      - name: Set up Kubeconfig
-        run: |
-          mkdir -p ~/.kube
-          echo "${{ secrets.KUBECONFIG_BASE64 }}" | base64 -d > ~/.kube/config
-          chmod 600 ~/.kube/config
-
-      - name: Deploy to Kubernetes
-        run: |
-          kubectl set image deployment/homepage homepage=ghcr.io/${{ github.repository }}:latest -n web
-
-      - name: Set up kubeconfig
-        run: |
-          mkdir -p ~/.kube
-          echo "${{ secrets.KUBECONFIG_BASE64 }}" | base64 -d > ~/.kube/config
-          chmod 600 ~/.kube/config
-        env:
-          KUBECONFIG: ~/.kube/config

infra/kubernetes/landing-page/deployment.yaml

@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: landing-page
+  labels:
+    app: landing-page
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: landing-page
+  template:
+    metadata:
+      labels:
+        app: landing-page
+    spec:
+      containers:
+        - name: landing-page
+          image: ghcr.io/kebrahimpour/avisenna-landing-page:latest
+          ports:
+            - containerPort: 80
+          resources:
+            limits:
+              memory: "128Mi"
+              cpu: "250m"
+            requests:
+              memory: "64Mi"
+              cpu: "100m"
+      imagePullSecrets:
+        - name: ghcr-secret

infra/kubernetes/landing-page/ingress.yaml

@@ -0,0 +1,23 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: landing-page
+  annotations:
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+spec:
+  ingressClassName: traefik
+  tls:
+    - hosts:
+        - avisenna-engineering.de
+      secretName: landing-page-tls
+  rules:
+    - host: avisenna-engineering.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: landing-page
+                port:
+                  number: 80

infra/kubernetes/landing-page/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: landing-page
+spec:
+  selector:
+    app: landing-page
+  ports:
+    - port: 80
+      targetPort: 80
+  type: ClusterIP

k8s/deployment.yaml

@@ -0,0 +1,42 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: prod
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: homepage
+  namespace: prod
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: homepage
+  template:
+    metadata:
+      labels:
+        app: homepage
+    spec:
+      containers:
+        - name: homepage
+          image: ghcr.io/kebrahimpour/avisenna-landing-page:latest
+          ports:
+            - containerPort: 80
+          imagePullPolicy: Always
+      imagePullSecrets:
+        - name: ghcr-creds
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: homepage
+  namespace: prod
+spec:
+  selector:
+    app: homepage
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  type: ClusterIP

scripts/update-github-secrets.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -euo pipefail
+
+REPO="kebrahimpour/avisenna-landing-page"
+GHCR_PAT="${GHCR_PAT:-}"
+TOKEN_SOURCE=""
+
+# Try env or fallback to file
+if [[ -z "$GHCR_PAT" ]]; then
+  TOKEN_PATH="$HOME/.secrets/g-token.txt"
+  if [[ -f "$TOKEN_PATH" ]]; then
+    GHCR_PAT=$(<"$TOKEN_PATH")
+    TOKEN_SOURCE="file"
+  fi
+else
+  TOKEN_SOURCE="env"
+fi
+
+if [[ -z "$GHCR_PAT" ]]; then
+  echo "❌ GHCR_PAT not found. Set as env or in ~/.secrets/g-token.txt"
+  exit 1
+fi
+
+echo "🔐 Using GHCR_PAT from $TOKEN_SOURCE"
+gh secret set GHCR_PAT --repo "$REPO" --body "$GHCR_PAT"
+echo "✅ GHCR_PAT updated"
+
+KCFG="$HOME/.kube/github-kubeconfig.yaml"
+if [[ ! -f "$KCFG" ]]; then
+  echo "❌ Kubeconfig not found at $KCFG"
+  exit 1
+fi
+
+ENCODED_KCFG=$(base64 -w 0 "$KCFG")
+gh secret set KUBECONFIG_B64 --repo "$REPO" --body "$ENCODED_KCFG"
+echo "✅ KUBECONFIG_B64 updated"

scripts/update-kubeconfig-secret.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -euo pipefail
+
+REPO="kebrahimpour/avisenna-landing-page"
+SECRET_NAME="KUBECONFIG_BASE64"
+SERVER="https://85.214.94.62:6443"
+
+echo "📦 Generating kubeconfig for GitHub Actions..."
+
+# Get secret associated with service account
+SECRET_NAME_REF=$(kubectl -n web get sa deploy-bot -o jsonpath="{.secrets[0].name}")
+TOKEN=$(kubectl -n web get secret "$SECRET_NAME_REF" -o jsonpath="{.data.token}" | base64 -d)
+CA_CERT=$(kubectl -n web get secret "$SECRET_NAME_REF" -o jsonpath="{.data['ca\\.crt']}" | base64 -d)
+
+mkdir -p .kube
+
+# Generate kubeconfig
+cat <<EOF > .kube/github-kubeconfig.yaml
+apiVersion: v1
+kind: Config
+clusters:
+- name: github-deploy
+  cluster:
+    certificate-authority-data: $(echo "$CA_CERT" | base64 -w 0)
+    server: $SERVER
+contexts:
+- name: github-deploy-context
+  context:
+    cluster: github-deploy
+    namespace: web
+    user: deploy-bot
+current-context: github-deploy-context
+users:
+- name: deploy-bot
+  user:
+    token: $TOKEN
+EOF
+
+# Encode and push secret to GitHub
+ENCODED=$(base64 -w 0 .kube/github-kubeconfig.yaml)
+
+echo "🔐 Updating GitHub secret $SECRET_NAME..."
+gh secret set $SECRET_NAME --repo "$REPO" --body "$ENCODED"
+
+echo "✅ KUBECONFIG_BASE64 updated and ready."

version.txt

@@ -1 +1 @@
-v0.0.5
+v0.0.6