diff --git a/k8s/moj-servis/configmap.yaml b/k8s/moj-servis/configmap.yaml
new file mode 100644
index 0000000..dad7c05
--- /dev/null
+++ b/k8s/moj-servis/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: moj-servis-config
+  namespace: student-sz11zs
+data:
+  SERVICE_NAME: "moj-servis"
+  LOG_LEVEL: "info"
+  WELCOME_MSG: "Pozdrav iz FPMOZ k3s clustera!"
\ No newline at end of file
diff --git a/k8s/moj-servis/deployment.yaml b/k8s/moj-servis/deployment.yaml
index 417326e..501eb16 100644
--- a/k8s/moj-servis/deployment.yaml
+++ b/k8s/moj-servis/deployment.yaml
@@ -15,13 +15,20 @@ spec:
     spec:
       containers:
       - name: moj-servis
-        image: git.fpmoz.sum.ba/sz11zs/moj-servis:2.0
+        image: git.fpmoz.sum.ba/sz11zs/moj-servis:1.0
         ports:
         - containerPort: 8000
-        resources:
-          requests:
-            memory: "64Mi"
-            cpu: "50m"
-          limits:
-            memory: "128Mi"
-            cpu: "200m"
\ No newline at end of file
+        envFrom:
+        - configMapRef:
+            name: moj-servis-config
+        env:
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: moj-servis-secret
+              key: DB_PASSWORD
+        - name: API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: moj-servis-secret
+              key: API_KEY
\ No newline at end of file
diff --git a/k8s/moj-servis/ingress.ymal b/k8s/moj-servis/ingress.ymal
new file mode 100644
index 0000000..576f0a1
--- /dev/null
+++ b/k8s/moj-servis/ingress.ymal
@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: moj-servis-ingress
+  namespace: student-sz11zs
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+spec:
+  rules:
+  - host: sz11zs.argocd.fpmoz.sum.ba
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: moj-servis-svc
+            port:
+              number: 80
\ No newline at end of file