From 4ce09fdd537be3c23aaf5805356a192a271a5f0b Mon Sep 17 00:00:00 2001 From: lroell Date: Thu, 9 Sep 2021 11:58:28 +0200 Subject: [PATCH 1/4] added semcust deployment --- dev/semcust/deployment.yaml | 126 ++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 dev/semcust/deployment.yaml diff --git a/dev/semcust/deployment.yaml b/dev/semcust/deployment.yaml new file mode 100644 index 0000000..a25ce1e --- /dev/null +++ b/dev/semcust/deployment.yaml @@ -0,0 +1,126 @@ +# Deployment description +apiVersion: apps/v1 +kind: Deployment +metadata: + name: semcust-deployment + namespace: dev-environment + labels: + app: semcust-dev +spec: + strategy: + type: Recreate + replicas: 1 + selector: + matchLabels: + app: semcust-dev + template: + metadata: + labels: + app: semcust-dev + spec: + # securityContext: + # runAsUser: 1000 + # runAsGroup: 1000 + # fsGroup: 1000 + containers: + - name: semcust-frontend + image: packages.semapp.lan:5000/semcust_frontend:develop + resources: + requests: + memory: "512Mi" + cpu: "100m" + limits: + memory: "1Gi" + cpu: "4" + ports: + - containerPort: 8200 + name: semcust-http + protocol: TCP + imagePullPolicy: Always + - name: backend + image: packages.semapp.lan:5000/semcust_backend:develop + resources: + requests: + memory: "512Mi" + cpu: "100m" + limits: + memory: "1Gi" + cpu: "4" + ports: + - containerPort: 5200 + name: backend + protocol: TCP + imagePullPolicy: Always + + envFrom: + - configMapRef: + name: semcust-dev-config-dev +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: dev-environment + name: semcust-dev-config-dev + labels: + app: semcust-dev +data: + DJANGO_DB_ENGINE: "django.db.backends.postgresql_psycopg2" + DJANGO_DB_NAME: "semcust-dev" + DJANGO_DB_USER: "semcust-dev" + DJANGO_DB_PASSWORD: "semcust-dev" + DJANGO_DB_HOST: "postgres-lb" + DJANGO_DB_PORT: "5432" + ALLOWED_HOSTS: '["*"]' + FRONTEND_URL: "semcust-dev.k3s.semapp.lan" + + +--- +# semcust Service +apiVersion: v1 +kind: Service +metadata: + name: semcust + namespace: dev-environment +spec: + selector: + app: semcust-dev + ports: + - name: semcust-http + port: 8200 + targetPort: semcust-http + type: NodePort + +--- +# semcust backend +apiVersion: v1 +kind: Service +metadata: + name: backend + namespace: dev-environment +spec: + selector: + app: semcust-dev + ports: + - name: backend + port: 5200 + targetPort: backend + type: NodePort +--- + +# Ingress description +apiVersion: networking.k8s.io/v1beta1 +kind: Ingress +metadata: + name: semcust-dev-ingress + namespace: dev-environment + annotations: + kubernetes.io/ingress.class: "traefik" +spec: + rules: + - host: semcust-dev.k3s.semapp.lan + http: + paths: + - path: / + backend: + serviceName: semcust + servicePort: 8200 \ No newline at end of file From f5a3a8ad84deaffdb43abe24d247566a0a246a01 Mon Sep 17 00:00:00 2001 From: lroell Date: Thu, 9 Sep 2021 12:54:54 +0200 Subject: [PATCH 2/4] renamed port names --- dev/semcust/deployment.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/semcust/deployment.yaml b/dev/semcust/deployment.yaml index a25ce1e..e8bc284 100644 --- a/dev/semcust/deployment.yaml +++ b/dev/semcust/deployment.yaml @@ -48,7 +48,7 @@ spec: cpu: "4" ports: - containerPort: 5200 - name: backend + name: semcust-backend protocol: TCP imagePullPolicy: Always @@ -79,7 +79,7 @@ data: apiVersion: v1 kind: Service metadata: - name: semcust + name: semcust-dev namespace: dev-environment spec: selector: @@ -101,9 +101,9 @@ spec: selector: app: semcust-dev ports: - - name: backend + - name: semcust-backend port: 5200 - targetPort: backend + targetPort: semcust-backend type: NodePort --- @@ -122,5 +122,5 @@ spec: paths: - path: / backend: - serviceName: semcust + serviceName: semcust-dev servicePort: 8200 \ No newline at end of file From 9030cba33ae65b96e5df3d8f196e234712bc0992 Mon Sep 17 00:00:00 2001 From: lroell Date: Fri, 17 Sep 2021 14:25:07 +0200 Subject: [PATCH 3/4] changed dev deployment for semcust --- dev/semcust/deployment.yaml | 130 +++++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 3 deletions(-) diff --git a/dev/semcust/deployment.yaml b/dev/semcust/deployment.yaml index e8bc284..5ef4dd3 100644 --- a/dev/semcust/deployment.yaml +++ b/dev/semcust/deployment.yaml @@ -36,6 +36,10 @@ spec: - containerPort: 8200 name: semcust-http protocol: TCP + volumeMounts: + - mountPath: /etc/nginx/conf.d + readOnly: true + name: nginx-conf imagePullPolicy: Always - name: backend image: packages.semapp.lan:5000/semcust_backend:develop @@ -55,6 +59,11 @@ spec: envFrom: - configMapRef: name: semcust-dev-config-dev + volumes: + - name: nginx-conf + configMap: + name: nginx-conf + --- apiVersion: v1 kind: ConfigMap @@ -72,14 +81,129 @@ data: DJANGO_DB_PORT: "5432" ALLOWED_HOSTS: '["*"]' FRONTEND_URL: "semcust-dev.k3s.semapp.lan" + API_URL: "http://semcust-dev.k3s.semapp.lan/" + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: dev-environment + name: nginx-conf +data: + default.conf: | + upstream backend { + server semcust-backend-dev:5200; + } + + server { + listen 8200; + + #server_name semcust-dev.semapp.lan; + + access_log /var/log/nginx/access.log; + charset utf-8; + client_max_body_size 1G; + + location / { + root /srv/semcust; + #add_header X-Frame-Options "SAMEORIGIN"; + index index.html index.htm; + try_files $uri $uri /index.html =404; + } + + location ~ ^/api { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + location /admin { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + location /forum { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + location /confluence { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + location /help-desk { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + location /static-backend { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + error_page 404 =200 /index.html; + + add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; + expires off; + open_file_cache off; + sendfile off; + } --- # semcust Service apiVersion: v1 kind: Service metadata: - name: semcust-dev + name: semcust-frontend-dev namespace: dev-environment spec: selector: @@ -95,7 +219,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: backend + name: semcust-backend-dev namespace: dev-environment spec: selector: @@ -122,5 +246,5 @@ spec: paths: - path: / backend: - serviceName: semcust-dev + serviceName: semcust-frontend-dev servicePort: 8200 \ No newline at end of file From 89deb1b908081193afe595896b8e4adbe23f50da Mon Sep 17 00:00:00 2001 From: lroell Date: Wed, 22 Sep 2021 09:08:05 +0200 Subject: [PATCH 4/4] resolved issues --- dev/semcust/deployment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/semcust/deployment.yaml b/dev/semcust/deployment.yaml index 5ef4dd3..af90eb5 100644 --- a/dev/semcust/deployment.yaml +++ b/dev/semcust/deployment.yaml @@ -41,7 +41,7 @@ spec: readOnly: true name: nginx-conf imagePullPolicy: Always - - name: backend + - name: semcust-backend image: packages.semapp.lan:5000/semcust_backend:develop resources: requests: @@ -55,7 +55,6 @@ spec: name: semcust-backend protocol: TCP imagePullPolicy: Always - envFrom: - configMapRef: name: semcust-dev-config-dev