From 7359d34a7892ba66cce4e5abcd13683e71b1687a Mon Sep 17 00:00:00 2001
From: IvaCerkez <iva.cerkez1@fpmoz.sum.ba>
Date: Tue, 7 Apr 2026 12:25:59 +0200
Subject: [PATCH] add: configmap, ingress + update deployment with env refs

---
 {k8s => k8n}/moj-servis/configmap.yaml |  0
 k8n/moj-servis/deployment.yaml         | 14 +++++++++
 {k8s => k8n}/moj-servis/ingress.yaml   |  0
 k8s/moj-servis/deployment.yaml         | 42 --------------------------
 k8s/moj-servis/service.yaml            | 14 ---------
 5 files changed, 14 insertions(+), 56 deletions(-)
 rename {k8s => k8n}/moj-servis/configmap.yaml (100%)
 rename {k8s => k8n}/moj-servis/ingress.yaml (100%)
 delete mode 100644 k8s/moj-servis/deployment.yaml
 delete mode 100644 k8s/moj-servis/service.yaml

diff --git a/k8s/moj-servis/configmap.yaml b/k8n/moj-servis/configmap.yaml
similarity index 100%
rename from k8s/moj-servis/configmap.yaml
rename to k8n/moj-servis/configmap.yaml
diff --git a/k8n/moj-servis/deployment.yaml b/k8n/moj-servis/deployment.yaml
index 313b573..bdb3024 100644
--- a/k8n/moj-servis/deployment.yaml
+++ b/k8n/moj-servis/deployment.yaml
@@ -19,6 +19,20 @@ spec:
         image: git.fpmoz.sum.ba/iva/moj-servis:1.0
         ports:
         - containerPort: 8000
+        envFrom:                          # <-- NOVO
+        - configMapRef:
+            name: moj-servis-config       # <-- ConfigMap
+        env:                               # <-- NOVO
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: moj-servis-secret      # <-- Secret
+              key: DB_PASSWORD
+        - name: API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: moj-servis-secret
+              key: API_KEY
         resources:
           requests:
             memory: "64Mi"
diff --git a/k8s/moj-servis/ingress.yaml b/k8n/moj-servis/ingress.yaml
similarity index 100%
rename from k8s/moj-servis/ingress.yaml
rename to k8n/moj-servis/ingress.yaml
diff --git a/k8s/moj-servis/deployment.yaml b/k8s/moj-servis/deployment.yaml
deleted file mode 100644
index bdb3024..0000000
--- a/k8s/moj-servis/deployment.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# k8s/moj-servis/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: moj-servis
-  namespace: student-iva
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: moj-servis
-  template:
-    metadata:
-      labels:
-        app: moj-servis
-    spec:
-      containers:
-      - name: moj-servis
-        image: git.fpmoz.sum.ba/iva/moj-servis:1.0
-        ports:
-        - containerPort: 8000
-        envFrom:                          # <-- NOVO
-        - configMapRef:
-            name: moj-servis-config       # <-- ConfigMap
-        env:                               # <-- NOVO
-        - name: DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: moj-servis-secret      # <-- Secret
-              key: DB_PASSWORD
-        - name: API_KEY
-          valueFrom:
-            secretKeyRef:
-              name: moj-servis-secret
-              key: API_KEY
-        resources:
-          requests:
-            memory: "64Mi"
-            cpu: "50m"
-          limits:
-            memory: "128Mi"
-            cpu: "200m"
diff --git a/k8s/moj-servis/service.yaml b/k8s/moj-servis/service.yaml
deleted file mode 100644
index 00858f8..0000000
--- a/k8s/moj-servis/service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# k8s/moj-servis/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: moj-servis-svc
-  namespace: student-iva
-spec:
-  selector:
-    app: moj-servis
-  ports:
-  - port: 80
-    targetPort: 8000
-    protocol: TCP
-  type: NodePort