From d93fb74459aee10853079dd5675b53830cc7de4e Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Wed, 10 Nov 2021 13:46:31 +0100 Subject: [PATCH 1/3] added yaml for rm-qa --- qa/rm/deployment.yaml | 246 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 qa/rm/deployment.yaml diff --git a/qa/rm/deployment.yaml b/qa/rm/deployment.yaml new file mode 100644 index 0000000..19a85bc --- /dev/null +++ b/qa/rm/deployment.yaml @@ -0,0 +1,246 @@ +# Deployment description +apiVersion: apps/v1 +kind: Deployment +metadata: + name: rm-deployment + namespace: qa-environment + labels: + app: rm-qa +spec: + strategy: + type: Recreate + replicas: 1 + selector: + matchLabels: + app: rm-qa + template: + metadata: + labels: + app: rm-qa + spec: + # securityContext: + # runAsUser: 1000 + # runAsGroup: 1000 + # fsGroup: 1000 + containers: + - name: rm-backend + image: packages.semapp.lan:5000/rm-backend:0.0.3 + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "4" + ports: + - containerPort: 5000 + name: rm-backend + protocol: TCP + volumeMounts: + - mountPath: /etc/flexrm/ + readOnly: true + name: flexrm-conf + imagePullPolicy: Always + - name: rm-frontend + image: packages.semapp.lan:5000/rm-frontend:0.0.1 + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "4" + ports: + - containerPort: 80 + name: rm-frontend + protocol: TCP + volumeMounts: + - mountPath: /etc/nginx/conf.d/ + readOnly: true + name: flexrm-frontend-conf + imagePullPolicy: Always + volumes: + - name: flexrm-frontend-conf + configMap: + name: flexrm-frontend-conf + - name: flexrm-conf + configMap: + name: flexrm-conf + +--- + +# Backend configuration +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: qa-environment + name: flexrm-conf +data: + flexrm.conf: | + [general] + allowed_hosts = * + secret_key = some_very_long_and_hyper_random_secret_key + + [db] + driver = postgresql + db_name = rm-qa + db_user = rm-qa + db_password = rm-qa + db_host = dbpg11.semapp.lan + + [analytics] + piwik_site_id = 3 + + [frontend] + frontend_url = https://rm-qa.k3s.semapp.lan/ + + [email] + host = smtp.strato.de + port = 587 + username = support@semantic-applications.de + password = uN1zPIqN9@br + use_tls = True + auto_from = support@semantic-applications.de + + [tex] + host = texservice.k3s.semapp.lan + delete_after_render = False + + [media-storage] + # + # the used media-storage is defined via type: + # + # media_type = django.core.files.storage.FileSystemStorage ... the default django file storage + # -> no additional settings are required + # + # media_type = minio_storage.storage.MinioMediaStorage ... the storage used with minio + # -> additional settings for minio: + # minio_endpoint = 127.0.0.1:9000 ... the endpoint and port + # minio_use_https = True|False ... use https for communication + # minio_media_bucket = media-rm ... the media bucket name + # minio_access_key = #your ACCESS_KEY ... the access key + # minio_secret_key = #your SECRET_KEY ... the secret key + # minio_auto_create_bucket = True|False ... if True the bucket is created + + # + # To setup minio storage as default for development just comment the file system storage line and uncomment + # all minio storage lines + # + + + # media_type = django.core.files.storage.FileSystemStorage + + media_type = flexrm.kernel.minio.storage.MinIOMediaStorage + minio_endpoint = minio-api-dev.k3s.semapp.lan + minio_use_https = False + minio_media_bucket = rm-qa + minio_access_key = rm-qa + minio_secret_key = "rm-qa123456!" + minio_auto_create_bucket = True +--- + +# Frontend nginx configuration +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: qa-environment + name: flexrm-frontend-conf +data: + default.conf: | + upstream backend { + server rm-backend-srv:5000; + } + + server { + listen 80; + + server_name $K8S_HOSTNAME; + + #access_log /var/log/rm/access.log; + #error_log /var/log/rm/error.log; + + charset utf-8; + client_max_body_size 1G; + + location / { + root /srv/rm-web; + + try_files $uri /index.html =404; + } + + location ~ ^/(api|drf|manage) { + 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; + } + + location /storage { + # TODO: still needed when we use minio? + alias /srv/media; + } + + location /static { + # TODO: still needed when we use minio? + alias /srv/public; + } + + # Redirect Angular routes + error_page 404 =200 /index.html; + } + +--- + +# RM backend Service +apiVersion: v1 +kind: Service +metadata: + name: rm-backend-srv + namespace: qa-environment +spec: + selector: + app: rm-qa + ports: + - name: rm-backend + port: 5000 + targetPort: rm-backend + type: NodePort + +--- + +#RM frontend service +apiVersion: v1 +kind: Service +metadata: + name: rm-frontend-srv + namespace: qa-environment +spec: + selector: + app: rm-qa + ports: + - name: rm-frontend + port: 80 + targetPort: rm-frontend + type: NodePort + +--- + + # Ingress description +apiVersion: networking.k8s.io/v1beta1 +kind: Ingress +metadata: + name: rm-qa-ingress + namespace: qa-environment + annotations: + kubernetes.io/ingress.class: "traefik" +spec: + rules: + - host: rm-qa.k3s.semapp.lan + http: + paths: + - path: / + backend: + serviceName: rm-frontend-srv + servicePort: 80 \ No newline at end of file From 60cbc7c0378f27fd3607bae12155f6e28012d41f Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Wed, 10 Nov 2021 16:43:45 +0100 Subject: [PATCH 2/3] small fixes to get rm backend working --- qa/rm/deployment.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qa/rm/deployment.yaml b/qa/rm/deployment.yaml index 19a85bc..ecd6c32 100644 --- a/qa/rm/deployment.yaml +++ b/qa/rm/deployment.yaml @@ -24,7 +24,7 @@ spec: # fsGroup: 1000 containers: - name: rm-backend - image: packages.semapp.lan:5000/rm-backend:0.0.3 + image: packages.semapp.lan:5000/rm-backend:0.0.4 resources: requests: memory: "256Mi" @@ -40,6 +40,9 @@ spec: - mountPath: /etc/flexrm/ readOnly: true name: flexrm-conf + env: + - name: DJANGO_ENV + value: "development" imagePullPolicy: Always - name: rm-frontend image: packages.semapp.lan:5000/rm-frontend:0.0.1 @@ -131,7 +134,7 @@ data: # media_type = django.core.files.storage.FileSystemStorage media_type = flexrm.kernel.minio.storage.MinIOMediaStorage - minio_endpoint = minio-api-dev.k3s.semapp.lan + minio_endpoint = minio-api-dev.semapp.lan minio_use_https = False minio_media_bucket = rm-qa minio_access_key = rm-qa From 6871dbe44fc168a8e740d6267b510838bf115843 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 16 Nov 2021 13:04:01 +0100 Subject: [PATCH 3/3] added new domain --- dev/minIO/server.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/minIO/server.yaml b/dev/minIO/server.yaml index 74d9a42..2088904 100644 --- a/dev/minIO/server.yaml +++ b/dev/minIO/server.yaml @@ -87,6 +87,13 @@ metadata: spec: rules: - host: minio-api-dev.k3s.semapp.lan + http: + paths: + - path: / + backend: + serviceName: minio-api + servicePort: 9000 + - host: minio-api-dev.semapp.lan http: paths: - path: /