diff --git a/backend-deployment.yaml b/backend-deployment.yaml index 085902a562191a62d187c03d0d4caed2d344d127..5a28930714b1c6cb1e1b4baf077cfafcdd2048bf 100644 --- a/backend-deployment.yaml +++ b/backend-deployment.yaml @@ -4,17 +4,20 @@ metadata: name: maed-exporter-backend namespace: mdata labels: - app.kubernetes.io/name: maed-exporter-backend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: backend app.kubernetes.io/version: "0.1.0" spec: selector: matchLabels: - app.kubernetes.io/name: maed-exporter-backend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: backend replicas: 1 template: metadata: labels: - app.kubernetes.io/name: maed-exporter-backend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: backend spec: containers: - name: maed-exporter-backend diff --git a/config-maps.yaml b/config-maps.yaml index af55f585660621bcd1b921bf392c336ebf0c6940..74432b2aa8a4e5264e4d5faf3c4d47a870f63e07 100644 --- a/config-maps.yaml +++ b/config-maps.yaml @@ -6,11 +6,11 @@ metadata: app.kubernetes.io/name: maed-exporter-app data: FRONTEND_PORT: "8090" - API_BASE: "backend-service.mdata.svc.cluster.local" + API_BASE: "maed-exporter-backend-svc.mdata.svc.cluster.local" API_PORT: "8080" API_PREFIX: "/api" EXPORT_DIR: "/exports/" - CORS_ORIGIN: "frontend-service.mdata.svc.cluster.local:8090" + CORS_ORIGIN: "maed-exporter-frontend-svc.mdata.svc.cluster.local:8090" --- apiVersion: v1 kind: ConfigMap @@ -22,6 +22,7 @@ data: # hash $cookie_simple_session consistent; default.conf.template: | upstream api { + hash $cookie_simple_session consistent; server ${API_BASE}:${API_PORT} max_fails=3 fail_timeout=30s; } @@ -51,7 +52,7 @@ data: default.conf: | upstream api { hash $cookie_simple_session consistent; - server backend-service.mdata.svc.cluster.local:8080 max_fails=3 fail_timeout=30s; + server maed-exporter-backend-svc.mdata.svc.cluster.local:8080 max_fails=3 fail_timeout=30s; } server { diff --git a/frontend-deployment.yaml b/frontend-deployment.yaml index 9dadfbed900b59d4af9a5ade21630e227f4c883c..3ffa4432b21663d2df27214540c466dd58ed76b9 100644 --- a/frontend-deployment.yaml +++ b/frontend-deployment.yaml @@ -4,12 +4,14 @@ metadata: name: maed-exporter-frontend namespace: mdata labels: - app.kubernetes.io/name: maed-exporter-frontend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: frontend app.kubernetes.io/version: "0.1.0" spec: selector: matchLabels: - app.kubernetes.io/name: maed-exporter-frontend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: frontend replicas: 1 revisionHistoryLimit: 5 strategy: @@ -17,7 +19,8 @@ spec: template: metadata: labels: - app.kubernetes.io/name: maed-exporter-frontend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: frontend spec: containers: - name: maed-exporter-frontend diff --git a/services.yaml b/services.yaml index 4330d49148c73414de852be9efc443430123bb4e..1c78642e1e6705229910ac036e8cec9b62405b31 100644 --- a/services.yaml +++ b/services.yaml @@ -1,31 +1,33 @@ apiVersion: v1 kind: Service metadata: - name: backend-service + name: maed-exporter-backend-svc namespace: mdata labels: app.kubernetes.io/name: maed-exporter-app spec: selector: - app.kubernetes.io/name: maed-exporter-backend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: backend ports: - protocol: TCP - port: 8080 # Cluster IP port - targetPort: 8080 # Port on the backend container - type: ClusterIP # Exposes the service only within the cluster + port: 8080 + targetPort: 8080 + type: ClusterIP --- apiVersion: v1 kind: Service metadata: - name: frontend-service + name: maed-exporter-frontend-svc namespace: mdata labels: app.kubernetes.io/name: maed-exporter-app spec: selector: - app.kubernetes.io/name: maed-exporter-frontend + app.kubernetes.io/name: maed-exporter-app + app.kubernetes.io/component: frontend ports: - protocol: TCP port: 8090 - targetPort: 8090 # Port on the frontend container + targetPort: 8090 type: NodePort \ No newline at end of file