From 200be22960013536482d2c6b73dbc47027c3b3d4 Mon Sep 17 00:00:00 2001 From: Mehdi Osman Date: Mon, 17 Jan 2022 18:16:46 +0100 Subject: [PATCH 01/10] Update README.md --- scripts/helmcharts/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/helmcharts/README.md b/scripts/helmcharts/README.md index b54ca9652..2e4475720 100644 --- a/scripts/helmcharts/README.md +++ b/scripts/helmcharts/README.md @@ -1,6 +1,3 @@ -- Initialize databases - - we've to pass the --wait flag, else the db installation won't be complete. and it'll break the db init. - ## Installation helm upgrade --install databases ./databases -n db --create-namespace --wait -f ./values.yaml --atomic From 2a21d2eeb60201d74e4d08acd0e312ca0486fef5 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Wed, 19 Jan 2022 00:10:31 +0530 Subject: [PATCH 02/10] fix(install): kafka ssl topic creation Signed-off-by: Rajesh Rajendran --- scripts/helmcharts/openreplay/files/kafka.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helmcharts/openreplay/files/kafka.sh b/scripts/helmcharts/openreplay/files/kafka.sh index 9105f3b00..1c811eb5d 100644 --- a/scripts/helmcharts/openreplay/files/kafka.sh +++ b/scripts/helmcharts/openreplay/files/kafka.sh @@ -13,7 +13,7 @@ topics=( touch /tmp/config.txt if [[ $KAFKA_SSL == "true" ]]; then - echo 'securty.protocol=SSL' > /tmp/config.txt + echo 'security.protocol=SSL' > /tmp/config.txt fi function init() { From 14b4d87943fd12fb3835d006bd18f8788976cc15 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Wed, 19 Jan 2022 22:47:06 +0530 Subject: [PATCH 03/10] chore(helm): using minio keys to initialize minio rather than s3. Signed-off-by: Rajesh Rajendran --- scripts/helmcharts/openreplay/templates/job.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/helmcharts/openreplay/templates/job.yaml b/scripts/helmcharts/openreplay/templates/job.yaml index 74e2cadcc..4e0cdebf4 100644 --- a/scripts/helmcharts/openreplay/templates/job.yaml +++ b/scripts/helmcharts/openreplay/templates/job.yaml @@ -81,9 +81,9 @@ spec: - name: CHART_APP_VERSION value: "{{ .Chart.AppVersion }}" - name: MINIO_ACCESS_KEY - value: "{{ .Values.global.s3.accessKey }}" + value: "{{ .Values.minio.global.minio.accessKey }}" - name: MINIO_SECRET_KEY - value: "{{ .Values.global.s3.secretKey }}" + value: "{{ .Values.minio.global.minio.secretKey }}" command: - /bin/bash - /opt/migrations/dbops.sh From 833e6000ae7bb6cdd16dc3baee294d1ba66562b6 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Wed, 19 Jan 2022 22:51:17 +0530 Subject: [PATCH 04/10] docs(helm): update vars.yaml examples Signed-off-by: Rajesh Rajendran --- scripts/helmcharts/vars.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml index 50bf9edd2..e8ef20bf7 100644 --- a/scripts/helmcharts/vars.yaml +++ b/scripts/helmcharts/vars.yaml @@ -87,14 +87,14 @@ chalice: # limits: # cpu: 1 -# nginx-ingress: +## Changes to nginx # -### If you want to redirect nginx http to https +# nginx-ingress: # customServerConfigs: | +# # Redirecting http to https # return 301 https://$host$request_uri; # ### Change the ssl certificates -# ### Public certificate ( content from site.crt, mind the indentation ) # ssl_certificate: |- # -----BEGIN CERTIFICATE----- @@ -109,10 +109,5 @@ chalice: # TbXr+1+HXWQGs4Go63gpvhI/yzOScTTiuI88lbjM9QA/aDlZm2TlXdcB71PDtO5T # e2Zw7SH2h7yLK6uP2FamVgUSe0rWf9zQmKTkFzJcgwelvuk7MHBMw4JSYeoB7dJP # 3+FMchvzM1exCC/kNxTqvAyYWzdNPBIPSekHn1I9eEgr14cwZ+1RV9SK16uxsMT9 -# WnjLAoIBADKutRKB8nH+wD3sa4cP782QNbkDqJCcb3rPntnCWI/jA2TeY/wAvrXa -# 8yFtSSeYSwN9Wr+UosSkQ+OQSO0WmT2NrxdkH8jK8kYnzYkJ9+EFE2YpMN2UosSb -# esQ9oEMnivBMNv8DnB4IuO8LjTj1rhqcBmWJH1zvDi1Ur+/uAb+6XLm0Dp/59/Rn -# PSlLQmFraq6mrUkKTU40zyT6eK8AvIn/+sXAF1Xb9Vnm8Ndl+gZ4imzjcCubbq+6 -# PqvLjFJNGyya6b3MX4RSxVGfkIf5f6bcSSZ0zzSB3qLbCKS+JawwR1WF2rJp6Hj5 # 7qINKoGovqXB1oAdopIl1z64e7MWVE4= # -----END PRIVATE KEY----- From 2a4badf94d8259c4b2066c267e1db7600b13fded Mon Sep 17 00:00:00 2001 From: Mehdi Osman Date: Thu, 20 Jan 2022 20:47:13 +0100 Subject: [PATCH 05/10] Added captcha env variables --- scripts/helmcharts/vars.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml index e8ef20bf7..e4928a786 100644 --- a/scripts/helmcharts/vars.yaml +++ b/scripts/helmcharts/vars.yaml @@ -67,6 +67,8 @@ global: chalice: env: jwt_secret: "SetARandomStringHere" + # CAPTCHA_SERVER: '' + # CAPTCHA_KEY: '' # SAML2_MD_URL: '' # idp_entityId: '' # idp_sso_url: '' From 1f8b9e2d8845099b353522deddcb819fbe37ae23 Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Fri, 21 Jan 2022 22:03:49 +0530 Subject: [PATCH 06/10] chore(nginx): Adding protocol scheme forwarding Signed-off-by: Rajesh Rajendran --- .../charts/nginx-ingress/templates/configMap.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml b/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml index f635b270c..77100c35c 100644 --- a/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml +++ b/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml @@ -62,7 +62,7 @@ data: proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $host; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Proto $origin_proto; proxy_pass http://chalice-openreplay.app.svc.cluster.local:8000; } location /assist/ { @@ -134,6 +134,10 @@ data: default upgrade; '' close; } + map $http_x_forwarded_proto $origin_proto { + default $http_x_forwarded_proto; + '' $scheme; + } server { listen 80 default_server; listen [::]:80 default_server; From b0e2fd127aa20ca231176aad4d9dbed61d451640 Mon Sep 17 00:00:00 2001 From: Mehdi Osman Date: Fri, 21 Jan 2022 18:02:36 +0100 Subject: [PATCH 07/10] Update vars.yaml --- scripts/helmcharts/vars.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml index e4928a786..91de773e0 100644 --- a/scripts/helmcharts/vars.yaml +++ b/scripts/helmcharts/vars.yaml @@ -67,8 +67,8 @@ global: chalice: env: jwt_secret: "SetARandomStringHere" - # CAPTCHA_SERVER: '' - # CAPTCHA_KEY: '' + # captcha_server: '' + # captcha_key: '' # SAML2_MD_URL: '' # idp_entityId: '' # idp_sso_url: '' From f6a318e50f2bd33e8e5ccbb0c2bde0f350f0972e Mon Sep 17 00:00:00 2001 From: Mehdi Osman Date: Fri, 21 Jan 2022 18:46:02 +0100 Subject: [PATCH 08/10] Update vars.yaml --- scripts/helmcharts/vars.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml index 91de773e0..0ca05ba87 100644 --- a/scripts/helmcharts/vars.yaml +++ b/scripts/helmcharts/vars.yaml @@ -84,10 +84,14 @@ chalice: # For example: # -# alerts: +# http: # resources: # limits: -# cpu: 1 +# cpu: 1024m +# memory: 4096Mi +# requests: +# cpu: 512m +# memory: 2056Mi ## Changes to nginx # From c9a016988d1b7364d85d80fa6f97916cd9514b9b Mon Sep 17 00:00:00 2001 From: Mehdi Osman Date: Fri, 21 Jan 2022 18:46:17 +0100 Subject: [PATCH 09/10] Update vars.yaml --- scripts/helmcharts/vars.yaml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml index 0ca05ba87..53272762b 100644 --- a/scripts/helmcharts/vars.yaml +++ b/scripts/helmcharts/vars.yaml @@ -100,20 +100,3 @@ chalice: # # Redirecting http to https # return 301 https://$host$request_uri; # -### Change the ssl certificates -### Public certificate ( content from site.crt, mind the indentation ) -# ssl_certificate: |- -# -----BEGIN CERTIFICATE----- -# MIIFITCCAwmgAwIBAgIUQ8hQoDbW3Z4DxRVjIYlIlbEHp/8wDQYJKoZIhvcNAQEL -# BQAwIDEeMBwGA1UEAwwVb3BlbnJlcGxheS5sb2NhbC5ob3N0MB4XDTIxMTIyMjA3 -# NDIxOVoXDTIyMTIyMjA3NDIxOVowIDEeMBwGA1UEAwwVb3BlbnJlcGxheS5sb2Nh -# -----END CERTIFICATE----- -# -### Private certificate ( content from site.key, mind the indentation. ) -# ssl_privatekey: |- -# -----BEGIN PRIVATE KEY----- -# TbXr+1+HXWQGs4Go63gpvhI/yzOScTTiuI88lbjM9QA/aDlZm2TlXdcB71PDtO5T -# e2Zw7SH2h7yLK6uP2FamVgUSe0rWf9zQmKTkFzJcgwelvuk7MHBMw4JSYeoB7dJP -# 3+FMchvzM1exCC/kNxTqvAyYWzdNPBIPSekHn1I9eEgr14cwZ+1RV9SK16uxsMT9 -# 7qINKoGovqXB1oAdopIl1z64e7MWVE4= -# -----END PRIVATE KEY----- From 8aca491f0e8b9de677b25be0cd028b54383c188a Mon Sep 17 00:00:00 2001 From: Mehdi Osman Date: Sun, 23 Jan 2022 22:14:44 +0100 Subject: [PATCH 10/10] Delete README.md --- scripts/helmcharts/README.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 scripts/helmcharts/README.md diff --git a/scripts/helmcharts/README.md b/scripts/helmcharts/README.md deleted file mode 100644 index 2e4475720..000000000 --- a/scripts/helmcharts/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## Installation -helm upgrade --install databases ./databases -n db --create-namespace --wait -f ./values.yaml --atomic - -helm upgrade --install openreplay ./openreplay -n app --create-namespace --wait -f ./values.yaml --atomic