From 569b441f72edc1e049d1e4cf493a8b361681ea2c Mon Sep 17 00:00:00 2001 From: ITO Mac Date: Tue, 7 Apr 2026 11:19:32 +0200 Subject: [PATCH] updated stuff --- .gitignore | 1 + k8s/distribuirani/configmap.yaml | 9 +++++++++ k8s/distribuirani/deployment.yaml | 14 ++++++++++++++ k8s/distribuirani/ingress.yaml | 2 +- k8s/distribuirani/service.yaml | 2 +- 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 k8s/distribuirani/configmap.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f54494f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +kubeconfig-Blazp04.yaml diff --git a/k8s/distribuirani/configmap.yaml b/k8s/distribuirani/configmap.yaml new file mode 100644 index 0000000..beefb77 --- /dev/null +++ b/k8s/distribuirani/configmap.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: moj-servis-config + namespace: student-blazp04 +data: + SERVICE_NAME: "distribuirani-service" + LOG_LEVEL: "info" + WELCOME_MSG: "Pozdrav iz FPMOZ k3s clustera!" \ No newline at end of file diff --git a/k8s/distribuirani/deployment.yaml b/k8s/distribuirani/deployment.yaml index 1a4507c..b677bb6 100644 --- a/k8s/distribuirani/deployment.yaml +++ b/k8s/distribuirani/deployment.yaml @@ -18,6 +18,20 @@ spec: image: git.fpmoz.sum.ba/blazp04/distribuirani:1.0 ports: - containerPort: 8000 + envFrom: + - configMapRef: + name: distribuirani-config + env: + - name: DB_PASSWORD + valueFrom: + secretKeyRef: + name: distribuirani-secret + key: DB_PASSWORD + - name: API_KEY + valueFrom: + secretKeyRef: + name: distribuirani-secret + key: API_KEY resources: requests: memory: "64Mi" diff --git a/k8s/distribuirani/ingress.yaml b/k8s/distribuirani/ingress.yaml index de9c2d5..4070569 100644 --- a/k8s/distribuirani/ingress.yaml +++ b/k8s/distribuirani/ingress.yaml @@ -4,7 +4,7 @@ metadata: name: distribuirani-ingress namespace: student-blazp04 annotations: - kubernetes.io/ingress.class: nginx + traefik.ingress.kubernetes.io/router.entrypoints: web spec: rules: - host: blazp04.argocd.fpmoz.sum.ba diff --git a/k8s/distribuirani/service.yaml b/k8s/distribuirani/service.yaml index 855f56c..67fc948 100644 --- a/k8s/distribuirani/service.yaml +++ b/k8s/distribuirani/service.yaml @@ -10,4 +10,4 @@ spec: - port: 80 targetPort: 8000 protocol: TCP - type: NodePort + type: ClusterIP