From 7dbeca4a187c504142d679e06bb5b769031f110c Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 11:02:19 +0200 Subject: [PATCH 1/7] updating java option for gateway --- Chart.yaml | 2 +- templates/gateway/gateway-deployment.yaml | 2 +- values.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 08f7faf..47bea18 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.0 +version: 0.10.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml index 93c2bce..8d132cd 100644 --- a/templates/gateway/gateway-deployment.yaml +++ b/templates/gateway/gateway-deployment.yaml @@ -33,7 +33,7 @@ spec: imagePullPolicy: Always env: - name: JAVA_TOOL_OPTIONS - value: "-Dgeorchestra.datadir=/etc/georchestra -Dspring.profiles.active=docker" + value: {{ $webapp.java_tool_options }} {{- include "georchestra.service-envs" . | nindent 10 }} {{- include "georchestra.common-envs" . | nindent 10 }} {{- include "georchestra.ldap-envs" . | nindent 10 }} diff --git a/values.yaml b/values.yaml index ee45b08..0050c9b 100644 --- a/values.yaml +++ b/values.yaml @@ -116,6 +116,7 @@ georchestra: gateway: enabled: false docker_image: georchestra/gateway:latest + java_tool_options: "-Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" datadir: volume: - name: georchestra-datadir From 5257c557526af79836b713ca4e96f9df3e675b73 Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 11:21:10 +0200 Subject: [PATCH 2/7] mission datadir config location --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 0050c9b..635052f 100644 --- a/values.yaml +++ b/values.yaml @@ -116,7 +116,7 @@ georchestra: gateway: enabled: false docker_image: georchestra/gateway:latest - java_tool_options: "-Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" + java_tool_options: "-Dgeorchestra.datadir=/etc/georchestra -Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" datadir: volume: - name: georchestra-datadir From b04a2fea9c116d4523968940eae97fbbc8a8f8ab Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 11:39:32 +0200 Subject: [PATCH 3/7] add java_opts --- templates/gateway/gateway-deployment.yaml | 2 ++ values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml index 8d132cd..3db5975 100644 --- a/templates/gateway/gateway-deployment.yaml +++ b/templates/gateway/gateway-deployment.yaml @@ -34,6 +34,8 @@ spec: env: - name: JAVA_TOOL_OPTIONS value: {{ $webapp.java_tool_options }} + - name: JAVA_OPTS + value: {{ $webapp.java_opts }} {{- include "georchestra.service-envs" . | nindent 10 }} {{- include "georchestra.common-envs" . | nindent 10 }} {{- include "georchestra.ldap-envs" . | nindent 10 }} diff --git a/values.yaml b/values.yaml index 635052f..ed3a2d1 100644 --- a/values.yaml +++ b/values.yaml @@ -117,6 +117,7 @@ georchestra: enabled: false docker_image: georchestra/gateway:latest java_tool_options: "-Dgeorchestra.datadir=/etc/georchestra -Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" + java_opts: "-Dgeorchestra.datadir=/etc/georchestra" datadir: volume: - name: georchestra-datadir From 0fe2a4dd6a97035948e94dddc567558df13e9307 Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 14:10:39 +0200 Subject: [PATCH 4/7] remore changing version --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 47bea18..08f7faf 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.1 +version: 0.10.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 5007ee9b7b01a5d994affde24a8c3ce96bb9b81e Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 16:55:01 +0200 Subject: [PATCH 5/7] set java_opts to static --- templates/gateway/gateway-deployment.yaml | 2 +- values.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml index 3db5975..692536d 100644 --- a/templates/gateway/gateway-deployment.yaml +++ b/templates/gateway/gateway-deployment.yaml @@ -35,7 +35,7 @@ spec: - name: JAVA_TOOL_OPTIONS value: {{ $webapp.java_tool_options }} - name: JAVA_OPTS - value: {{ $webapp.java_opts }} + value: "-Dgeorchestra.datadir=/etc/georchestra" {{- include "georchestra.service-envs" . | nindent 10 }} {{- include "georchestra.common-envs" . | nindent 10 }} {{- include "georchestra.ldap-envs" . | nindent 10 }} diff --git a/values.yaml b/values.yaml index ed3a2d1..635052f 100644 --- a/values.yaml +++ b/values.yaml @@ -117,7 +117,6 @@ georchestra: enabled: false docker_image: georchestra/gateway:latest java_tool_options: "-Dgeorchestra.datadir=/etc/georchestra -Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" - java_opts: "-Dgeorchestra.datadir=/etc/georchestra" datadir: volume: - name: georchestra-datadir From 696a09b079c0e1379bed7cc887240723fe1e991b Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 17:29:54 +0200 Subject: [PATCH 6/7] update remove java_opts --- templates/gateway/gateway-deployment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml index 692536d..8d132cd 100644 --- a/templates/gateway/gateway-deployment.yaml +++ b/templates/gateway/gateway-deployment.yaml @@ -34,8 +34,6 @@ spec: env: - name: JAVA_TOOL_OPTIONS value: {{ $webapp.java_tool_options }} - - name: JAVA_OPTS - value: "-Dgeorchestra.datadir=/etc/georchestra" {{- include "georchestra.service-envs" . | nindent 10 }} {{- include "georchestra.common-envs" . | nindent 10 }} {{- include "georchestra.ldap-envs" . | nindent 10 }} From 047e816c215ccd448f383df782d9c3bec2a03a10 Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 4 Sep 2023 17:55:18 +0200 Subject: [PATCH 7/7] change hearachie --- templates/gateway/gateway-deployment.yaml | 2 +- values.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml index 8d132cd..bcc9723 100644 --- a/templates/gateway/gateway-deployment.yaml +++ b/templates/gateway/gateway-deployment.yaml @@ -33,7 +33,7 @@ spec: imagePullPolicy: Always env: - name: JAVA_TOOL_OPTIONS - value: {{ $webapp.java_tool_options }} + value: {{ $webapp.environment.JAVA_TOOL_OPTIONS }} {{- include "georchestra.service-envs" . | nindent 10 }} {{- include "georchestra.common-envs" . | nindent 10 }} {{- include "georchestra.ldap-envs" . | nindent 10 }} diff --git a/values.yaml b/values.yaml index 635052f..75f4822 100644 --- a/values.yaml +++ b/values.yaml @@ -116,7 +116,9 @@ georchestra: gateway: enabled: false docker_image: georchestra/gateway:latest - java_tool_options: "-Dgeorchestra.datadir=/etc/georchestra -Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" + environment: + JAVA_TOOL_OPTIONS: "-Dgeorchestra.datadir=/etc/georchestra -Dspring.config.location=${georchestra.datadir}/gateway/application.yaml -Dspring.profiles.active=docker" + extra_environment: [] datadir: volume: - name: georchestra-datadir