From f97df3bae2ebc8367fd8d3b8f9de58b2c8188444 Mon Sep 17 00:00:00 2001
From: Marija Musa <marija.musa@fsre.sum.ba>
Date: Tue, 7 Apr 2026 12:12:30 +0200
Subject: [PATCH] add: configmap, ingress + update deployment with env refs

---
 k8s/moj-servis/configmap.yaml                 |  9 +++++++++
 .../moj-servis/deployment.yaml                | 14 ++++++++++++++
 k8s/moj-servis/ingress.yaml                   | 19 +++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 k8s/moj-servis/configmap.yaml
 rename deployment.yaml => k8s/moj-servis/deployment.yaml (53%)
 create mode 100644 k8s/moj-servis/ingress.yaml

diff --git a/k8s/moj-servis/configmap.yaml b/k8s/moj-servis/configmap.yaml
new file mode 100644
index 0000000..1ebebfd
--- /dev/null
+++ b/k8s/moj-servis/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: moj-servis-config
+  namespace: student-marijam1909
+data:
+  SERVICE_NAME: "moj-servis"
+  LOG_LEVEL: "info"
+  WELCOME_MSG: "Pozdrav iz FPMOZ k3s clustera!"
diff --git a/deployment.yaml b/k8s/moj-servis/deployment.yaml
similarity index 53%
rename from deployment.yaml
rename to k8s/moj-servis/deployment.yaml
index d1a6d26..6ca597e 100644
--- a/deployment.yaml
+++ b/k8s/moj-servis/deployment.yaml
@@ -18,6 +18,20 @@ spec:
         image: git.fpmoz.sum.ba/marijam1909/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/k8s/moj-servis/ingress.yaml
new file mode 100644
index 0000000..c42cf8e
--- /dev/null
+++ b/k8s/moj-servis/ingress.yaml
@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: moj-servis-ingress
+  namespace: student-marijam1909
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+spec:
+  rules:
+  - host: marijam1909.argocd.fpmoz.sum.ba
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: moj-servis-svc
+            port:
+              number: 80