From 5c9fc5efa5ca4b76f42e965efac651dff76410c1 Mon Sep 17 00:00:00 2001
From: bcbaceli <bozena.copic.bacelic@fpmoz.sum.ba>
Date: Mon, 4 May 2026 12:56:27 +0200
Subject: [PATCH] add: configmap, ingress + update deployment with env refs

---
 k8s/moj-servis/configmap.yaml  |  9 +++++++++
 k8s/moj-servis/deployment.yaml | 16 +++++++++++++++-
 k8s/moj-servis/ingress.yaml    | 19 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 k8s/moj-servis/configmap.yaml
 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..cc1e0ba
--- /dev/null
+++ b/k8s/moj-servis/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: moj-servis-config
+  namespace: student-bcbaceli
+data:
+  SERVICE_NAME: "moj-servis"
+  LOG_LEVEL: "info"
+  WELCOME_MSG: "Pozdrav iz FPMOZ k3s clustera!"
diff --git a/k8s/moj-servis/deployment.yaml b/k8s/moj-servis/deployment.yaml
index 5d6dae9..b6df05f 100644
--- a/k8s/moj-servis/deployment.yaml
+++ b/k8s/moj-servis/deployment.yaml
@@ -15,9 +15,23 @@ spec:
     spec:
       containers:
       - name: moj-servis
-        image: git.fpmoz.sum.ba/bcbaceli/moj-servis:2.0
+        image: git.fpmoz.sum.ba/bcbaceli/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..cbf78f5
--- /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-bcbaceli
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+spec:
+  rules:
+  - host: bcbaceli.argocd.fpmoz.sum.ba
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: moj-servis-svc
+            port:
+              number: 80