Merge pull request #37 from terrestris/gnos-liniting-issues

Fix helm lintint errors for GNOS helm chart
terrestris · Sep 2, 2023 · 8a19c22 · 8a19c22
2 parents 71890a7 + 0f09be0
commit 8a19c22
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ requirements.lock
 Chart.lock
 charts/**/*.tgz
 *.iml
+.idea/
diff --git a/charts/gnos/Chart.yaml b/charts/gnos/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.0.1
+version: 0.0.2
 
 # 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/charts/gnos/templates/deployment.yaml b/charts/gnos/templates/deployment.yaml
@@ -49,22 +49,22 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
             - name: JAVA_OPTS
-              value: |-
-              -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
-              -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true
-              -Xms512M -Xss512M -Xmx2G -XX:+UseConcMarkSweepGC
-              -Dgeonetwork.resources.dir=/var/lib/geonetwork_data/resources
-              -Dgeonetwork.data.dir=/var/lib/geonetwork_data
-              -Dgeonetwork.codeList.dir=/var/lib/jetty/webapps/geonetwork/WEB-INF/data/config/codelist
-              -Dgeonetwork.schema.dir=/var/lib/jetty/webapps/geonetwork/WEB-INF/data/config/schema_plugins
-              -Dgeonetwork.db.type=postgres
-              -Djdbc.database={{ .Values.db.name }}
-              -Djdbc.username={{ .Values.db.username }}
-              -Djdbc.password={{ .Values.db.password }}
-              -Djdbc.host={{ .Values.db.host }}
-              -Djdbc.port={{ .Values.db.port }}
+              value: |
+                -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
+                -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true
+                -Xms512M -Xss512M -Xmx2G -XX:+UseConcMarkSweepGC
+                -Dgeonetwork.resources.dir=/var/lib/geonetwork_data/resources
+                -Dgeonetwork.data.dir=/var/lib/geonetwork_data
+                -Dgeonetwork.codeList.dir=/var/lib/jetty/webapps/geonetwork/WEB-INF/data/config/codelist
+                -Dgeonetwork.schema.dir=/var/lib/jetty/webapps/geonetwork/WEB-INF/data/config/schema_plugins
+                -Dgeonetwork.db.type=postgres
+                -Djdbc.database={{ .Values.db.name }}
+                -Djdbc.username={{ .Values.db.username }}
+                -Djdbc.password={{ .Values.db.password }}
+                -Djdbc.host={{ .Values.db.host }}
+                -Djdbc.port={{ .Values.db.port }}
             - name: ELASTICSEARCH_HOSTS
-              value: ["http://gnos-es-http:9200"]
+              value: "[\"http://gnos-es-http:9200\"]"
             - name: SERVER_NAME
               value: gnos-kb-http
             - name: KIBANA_INDEX