bez ispravljeni koda

.gitea/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: CI/CD Pipeline
+name: CI/CD Pipeline popravak
 
 on:
   push:
@@ -18,7 +18,7 @@ jobs:
       - name: Login u Gitea registry
         run: |
           echo ${{ secrets.REGISTRY_PASS }} | \
-            docker login $REGISTRY \
+            docker login git.fpmoz.sum.ba \
             -u ${{ secrets.REGISTRY_USER }} --password-stdin
 
       - name: Build i Push image
@@ -47,19 +47,24 @@ jobs:
         with:
           name: image-tag
 
+      - name: Instaliraj kubectl
+        uses: azure/setup-kubectl@v3
+        with:
+          version: 'latest' 
       - name: Postavi kubeconfig
         run: |
-          mkdir -p ~/.kube
+          # 1. Uzimamo tvoj plavi kod i pretvaramo ga nazad u pravu datoteku
-          echo "${{ secrets.KUBE_CONFIG }}" | base64 -d > ~/.kube/config
+          echo "${{ secrets.KUBE_CONFIG }}" | base64 -d > kubeconfig
-          chmod 600 ~/.kube/config
+          chmod 600 kubeconfig
 
       - name: Update image tag u manifestu
         run: |
           TAG=$(cat tag.txt)
-          sed -i "s|image:.*|image: $IMAGE:$TAG|" k8s/deployment.yaml
+          IMAGE="ghcr.io/sz11zs/hello-cicd"
-
+          sed -i "s|image:.*|image: $IMAGE:$TAG|" k8s/deployment.yaml 
       - name: Deploy na k3s
         run: |
-          kubectl apply -f k8s/
+          # 2. DODATAK: Prisiljavamo kubectl da gleda baš tu datoteku, a ne 127.0.0.1
-          kubectl rollout status deployment/hello-cicd \
+          export KUBECONFIG=$GITHUB_WORKSPACE/kubeconfig
-            -n student-${{ github.actor }} --timeout=120s
+          kubectl apply -f k8s/ --validate=false
+          kubectl rollout status deployment/hello-cicd -n student-sz11zs --timeout=120s  

k8s/deployment.yaml

@@ -1,59 +1,28 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: moj-servis
+  name: hello-cicd
   namespace: student-sz11zs
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: moj-servis
+      app: hello-cicd
   template:
     metadata:
       labels:
-        app: moj-servis
+        app: hello-cicd
     spec:
       imagePullSecrets:
       - name: gitea-creds
       containers:
-      - name: moj-servis
+      - name: hello-cicd
-        image: git.fpmoz.sum.ba/sz11zs/moj-servis:1.0
+        image: git.fpmoz.sum.ba/sz11zs/hello-cicd:latest
         ports:
         - containerPort: 8000
-        
-        # 1. POVEZIVANJE S OKOLINSKIM VARIJABLAMA (Secret i ConfigMap)
         env:
-        - name: DB_PASSWORD
+        - name: APP_VERSION
-          valueFrom:
+          value: "latest"
-            secretKeyRef:
+        resources:
-              name: moj-servis-secret
+          requests: {cpu: 50m, memory: 64Mi}
-              key: DB_PASSWORD
+          limits:   {cpu: 200m, memory: 128Mi}
-        - name: API_KEY
-          valueFrom:
-            secretKeyRef:
-              name: moj-servis-secret
-              key: API_KEY
-        envFrom:
-        - configMapRef:
-            name: moj-servis-config
-
-        # 2. LIVENESS PROBE: Dodano za Korak 1.4
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8000
-          initialDelaySeconds: 10
-          periodSeconds: 15
-          timeoutSeconds: 3
-          failureThreshold: 3
-
-        # 3. READINESS PROBE: Dodano za Korak 1.4
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 8000
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          timeoutSeconds: 2
-          failureThreshold: 2
-          

main.py

@@ -14,4 +14,4 @@ def health():
 @app.get("/")
 def root():
     return {"poruka": "Zdravo s k3s!", "host": os.uname().nodename}
-    
+