From 3ac955958ac9f8bba0f9d6ca2885fa0e3495d0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijanela=20Pranji=C4=87?= Date: Tue, 14 Apr 2026 11:08:40 +0200 Subject: [PATCH] Ispravka --- gitea/workflows/ci.yml | 70 ------------------------------------------ k8s/deployment.yaml | 10 +++--- k8s/service.yml | 4 +-- 3 files changed, 7 insertions(+), 77 deletions(-) delete mode 100644 gitea/workflows/ci.yml diff --git a/gitea/workflows/ci.yml b/gitea/workflows/ci.yml deleted file mode 100644 index b6e0517..0000000 --- a/gitea/workflows/ci.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: CI/CD Pipeline - -on: - push: - branches: [main] - -env: - REGISTRY: git.fpmoz.sum.ba - IMAGE: git.fpmoz.sum.ba/${{ github.repository }} - -jobs: - - # ── JOB 1: Build i Push Docker image ────────────────── - build: - runs-on: ubuntu-latest - steps: - - - name: Checkout koda - uses: actions/checkout@v4 - - - name: Login u Gitea registry - run: | - echo ${{ secrets.REGISTRY_PASS }} | \ - docker login $REGISTRY \ - -u ${{ secrets.REGISTRY_USER }} --stdin - - - name: Build i Push image - run: | - TAG=${{ github.sha }} - docker build -t $IMAGE:$TAG -t $IMAGE:latest . - docker push $IMAGE:$TAG - docker push $IMAGE:latest - echo $TAG > tag.txt - - - name: Spremi image tag - uses: actions/upload-artifact@v4 - with: - name: image-tag - path: tag.txt - # ── JOB 2: Deploy na k3s ─────────────────────────────── - deploy: - needs: build - runs-on: ubuntu-latest - steps: - - - name: Checkout koda - uses: actions/checkout@v4 - - - name: Preuzmi image tag - uses: actions/download-artifact@v4 - with: - name: image-tag - - - name: Postavi kubeconfig - run: | - mkdir -p ~/.kube - echo "${{ secrets.KUBE_CONFIG }}" | base64 -d > ~/.kube/config - chmod 600 ~/.kube/config - - - name: Update image tag u manifestu - run: | - TAG=$(cat tag.txt) - sed -i "s|image:.*|image: $IMAGE:$TAG|" k8s/deployment.yaml - - - name: Deploy na k3s - run: | - kubectl apply -f k8s/ - kubectl rollout status deployment/hello-cicd \ - -n student-${{ github.actor }} --timeout=120s - diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index c3960bf..f9bb930 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: hello-cicd + name: helloo-cicdd namespace: student-marijanela218 spec: replicas: 1 selector: matchLabels: - app: hello-cicd + app: helloo-cicdd template: metadata: labels: - app: hello-cicd + app: helloo-cicdd spec: imagePullSecrets: - name: gitea-creds containers: - - name: hello-cicd - image: git.fpmoz.sum.ba/Marijanela218/hello-cicd:latest + - name: helloo-cicdd + image: git.fpmoz.sum.ba/Marijanela218/helloo-cicdd:latest ports: - containerPort: 8000 env: diff --git a/k8s/service.yml b/k8s/service.yml index 03f0022..2f07a05 100644 --- a/k8s/service.yml +++ b/k8s/service.yml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: hello-cicd-svc + name: helloo-cicdd-svc namespace: student-marijanela218 spec: selector: - app: hello-cicd + app: helloo-cicdd ports: - port: 80 targetPort: 8000