From fccb65867d58f0fa032c4a560ab48b00c6e3a9a6 Mon Sep 17 00:00:00 2001 From: antejavor Date: Tue, 26 Nov 2024 14:39:47 +0100 Subject: [PATCH 1/4] Add base path env. --- charts/memgraph-lab/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/memgraph-lab/values.yaml b/charts/memgraph-lab/values.yaml index 16b6cf3..5dd64da 100644 --- a/charts/memgraph-lab/values.yaml +++ b/charts/memgraph-lab/values.yaml @@ -47,9 +47,11 @@ fullnameOverride: "" # Supported env variables: https://memgraph.com/docs/data-visualization/install-and-connect#environment-variables env: - name: QUICK_CONNECT_MG_HOST - value: memgraph + value: memgraph-db - name: QUICK_CONNECT_MG_PORT value: "7687" + - name: BASE_PATH + value: / podSecurityContext: {} # fsGroup: 2000 From 062d4741ad81841b3d7fd521fe1ea5848dc207b1 Mon Sep 17 00:00:00 2001 From: antejavor Date: Thu, 28 Nov 2024 09:31:39 +0100 Subject: [PATCH 2/4] Update. --- charts/memgraph-lab/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/memgraph-lab/README.md b/charts/memgraph-lab/README.md index ab16f93..a61b496 100644 --- a/charts/memgraph-lab/README.md +++ b/charts/memgraph-lab/README.md @@ -47,5 +47,7 @@ env: value: memgraph - name: QUICK_CONNECT_MG_PORT value: "7687" + - name: BASE_PATH + value: / ``` Refer to the [Memgraph Lab documentation](https://memgraph.com/docs/data-visualization) for details on how to connect to and interact with Memgraph. From 61845deacc523203ca9df1c415891dc5834a0f53 Mon Sep 17 00:00:00 2001 From: antejavor Date: Thu, 28 Nov 2024 12:06:40 +0100 Subject: [PATCH 3/4] Update readiness and liveness probes --- charts/memgraph-lab/Chart.yaml | 4 ++-- charts/memgraph-lab/templates/_helpers.tpl | 11 +++++++++ charts/memgraph-lab/templates/deployment.yaml | 4 ++-- charts/memgraph-lab/values.yaml | 24 +++++++++---------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/charts/memgraph-lab/Chart.yaml b/charts/memgraph-lab/Chart.yaml index bc73885..1e296b4 100644 --- a/charts/memgraph-lab/Chart.yaml +++ b/charts/memgraph-lab/Chart.yaml @@ -3,10 +3,10 @@ name: memgraph-lab home: https://memgraph.com/ type: application # Chart version, should be incremented each time the chart changes, including appVersion. -version: 0.1.4 +version: 0.1.5 # Version number of the docker image memgraph/lab. # Use it with quotes. -appVersion: "2.18.1" +appVersion: "2.19.1" description: Memgraph Lab Helm Chart keywords: - graph diff --git a/charts/memgraph-lab/templates/_helpers.tpl b/charts/memgraph-lab/templates/_helpers.tpl index 7f98280..602a042 100644 --- a/charts/memgraph-lab/templates/_helpers.tpl +++ b/charts/memgraph-lab/templates/_helpers.tpl @@ -60,3 +60,14 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{/* +Get the base path env value +*/}} +{{- define "getBasePath" -}} +{{- range .Values.env }} + {{- if eq .name "BASE_PATH" }} + {{- .value }} + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/memgraph-lab/templates/deployment.yaml b/charts/memgraph-lab/templates/deployment.yaml index 4e778e5..49c2fef 100644 --- a/charts/memgraph-lab/templates/deployment.yaml +++ b/charts/memgraph-lab/templates/deployment.yaml @@ -39,11 +39,11 @@ spec: protocol: TCP livenessProbe: httpGet: - path: /check + path: {{ include "getBasePath" . }}/check port: http readinessProbe: httpGet: - path: /check + path: {{ include "getBasePath" . }}/check port: http resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/charts/memgraph-lab/values.yaml b/charts/memgraph-lab/values.yaml index 5dd64da..9d2e7cc 100644 --- a/charts/memgraph-lab/values.yaml +++ b/charts/memgraph-lab/values.yaml @@ -39,22 +39,20 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: "" - imagePullSecrets: [] nameOverride: "" fullnameOverride: "" # Supported env variables: https://memgraph.com/docs/data-visualization/install-and-connect#environment-variables env: - - name: QUICK_CONNECT_MG_HOST - value: memgraph-db - - name: QUICK_CONNECT_MG_PORT - value: "7687" - - name: BASE_PATH - value: / +- name: QUICK_CONNECT_MG_HOST + value: memgraph-db +- name: QUICK_CONNECT_MG_PORT + value: "7687" +- name: BASE_PATH + value: "" -podSecurityContext: {} - # fsGroup: 2000 +podSecurityContext: {} # fsGroup: 2000 securityContext: {} # capabilities: @@ -71,10 +69,10 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls # hosts: From e654aafd6576e989bf346d74ee6f19d3a9397c79 Mon Sep 17 00:00:00 2001 From: antejavor Date: Thu, 28 Nov 2024 12:10:02 +0100 Subject: [PATCH 4/4] Comment fix. --- charts/memgraph-lab/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/memgraph-lab/values.yaml b/charts/memgraph-lab/values.yaml index 9d2e7cc..51b2c5d 100644 --- a/charts/memgraph-lab/values.yaml +++ b/charts/memgraph-lab/values.yaml @@ -52,7 +52,7 @@ env: - name: BASE_PATH value: "" -podSecurityContext: {} # fsGroup: 2000 +podSecurityContext: {} securityContext: {} # capabilities: