diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bff11c094ec04bce7a87aed08e5e9b5e6e8a785..fefe0146ff60ef733c7ec04610ce6d2cfb418b10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,6 +211,8 @@ lint: update --file data/all_predictions_statistics.csv --document structure + allow_failure: false + update-meilisearch-index:dev: rules: @@ -249,6 +251,7 @@ update-meilisearch-index:prod: artifacts: reports: dotenv: build.env + allow_failure: false set-meili-env:dev: diff --git a/deploy/df-wiki/templates/configmap-nginx-conf.yaml b/deploy/df-wiki/templates/configmap-nginx-conf.yaml new file mode 100644 index 0000000000000000000000000000000000000000..91f9df70a093f783bc48ac4a01b78548556ea48d --- /dev/null +++ b/deploy/df-wiki/templates/configmap-nginx-conf.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: nginx-config +data: + default.conf: | + server { + listen 8080; + server_name localhost; + location /wiki { + alias /etc/nginx/html/; + index index.html index.htm; + try_files $uri $uri/ $uri/index.html /index.html =404; + + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + alias /etc/nginx/html/; + } + } \ No newline at end of file diff --git a/deploy/df-wiki/templates/deployment.yaml b/deploy/df-wiki/templates/deployment.yaml index d6e2fb6e8993d36e271c19b1f731cffe0ac9439f..6ac7bd1976d21d82013e962bbf595021c630a309 100644 --- a/deploy/df-wiki/templates/deployment.yaml +++ b/deploy/df-wiki/templates/deployment.yaml @@ -49,6 +49,13 @@ spec: port: http resources: {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - mountPath: /tmp + name: tmp + - name: nginx-config + mountPath: /etc/nginx/conf.d/ + + {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -61,3 +68,10 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + volumes: + - emptyDir: {} + name: tmp + - name: nginx-config + configMap: + name: nginx-config + diff --git a/deploy/df-wiki/values.production.yaml b/deploy/df-wiki/values.production.yaml index 74a786562a3f2d85a6087e5a10881bda8b976bf8..bedbfc513857bda8724c63fed299bb7bc9326b74 100644 --- a/deploy/df-wiki/values.production.yaml +++ b/deploy/df-wiki/values.production.yaml @@ -4,7 +4,7 @@ image: ingress: enabled: false annotations: - - kubernetes.io/ingress.class: internal + - kubernetes.io/ingress.class: external hosts: - host: chart-example.local paths: diff --git a/deploy/meilisearch/values.production.yaml b/deploy/meilisearch/values.production.yaml index 3884eba6225bebc7f579248fa4c69dbb39b740a8..7dd7be53a3505e3ae3893bdb45f1c315401549b0 100644 --- a/deploy/meilisearch/values.production.yaml +++ b/deploy/meilisearch/values.production.yaml @@ -3,7 +3,7 @@ meilisearch: MEILI_MASTER_KEY: "MASTER_KEY" ingress: enabled: true - className: internal + className: external annotations: nginx.ingress.kubernetes.io/proxy-body-size: 100m hosts: diff --git a/nginx.conf b/nginx.conf index a32514e307f096c36b9a8bd81677e90a2b561cab..daf15e6523f33f4bdbf340815efaae126bf758e3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -2,7 +2,7 @@ server_tokens off; server { listen 8080; server_name localhost; - location /wiki/ { + location /wiki { alias /etc/nginx/html/; index index.html index.htm; try_files $uri $uri/ $uri/index.html /index.html;