charts/snowplow-iglu-server: support distroless docker images (close #79

)
snowplow-devops · Jan 3, 2023 · d1f0d1f · d1f0d1f
1 parent b13d65a
commit d1f0d1f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/charts/snowplow-iglu-server/Chart.yaml b/charts/snowplow-iglu-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: snowplow-iglu-server
 description: A Helm Chart to deploy the Snowplow Iglu Server project
-version: 0.1.8
+version: 0.1.9
 appVersion: "0.8.7"
 icon: https://raw.githubusercontent.com/snowplow-devops/helm-charts/master/docs/logo/snowplow.png
 home: https://github.com/snowplow-devops/helm-charts

diff --git a/charts/snowplow-iglu-server/templates/iglu-deployment.yaml b/charts/snowplow-iglu-server/templates/iglu-deployment.yaml
@@ -41,11 +41,8 @@ spec:
         imagePullPolicy: {{ default "IfNotPresent" .Values.service.image.pullPolicy }}
 
         args:
-        - "-Dconfig.override_with_env_vars=true"
-        {{- if ne .Values.service.config.hoconBase64 "" }}
         - "--config"
-        - "/etc/config/config.hocon"
-        {{- end }}
+        - {{if ne .Values.service.config.hoconBase64 "" }} "/etc/config/config.hocon" {{ else }} "/dev/null" {{ end }}
 
         ports:
         - containerPort: {{ .Values.service.port }}
@@ -75,10 +72,8 @@ spec:
           value: "{{ .Values.service.config.database.dbname }}"
         - name : "CONFIG_FORCE_iglu_patchesAllowed"
           value: "{{ .Values.service.config.patchesAllowed }}"
-        {{- if not (empty .Values.service.config.javaOpts) }}
-        - name : "JAVA_OPTS"
-          value: "{{ .Values.service.config.javaOpts }}"
-        {{- end }}
+        - name : "JDK_JAVA_OPTIONS"
+          value: "-Dconfig.override_with_env_vars=true {{ .Values.service.config.javaOpts }}"
 
         envFrom:
         - secretRef:

diff --git a/charts/snowplow-iglu-server/templates/iglu-hooks.yaml b/charts/snowplow-iglu-server/templates/iglu-hooks.yaml
@@ -19,10 +19,11 @@ spec:
         imagePullPolicy: Always
 
         args:
-        - "-Dconfig.override_with_env_vars=true"
         - "setup"
 
         env:
+        - name: "JDK_JAVA_OPTIONS"
+          value: "-Dconfig.override_with_env_vars=true"
         {{- if .Values.service.gcp.deployProxy }}
         - name : "CONFIG_FORCE_iglu_database_host"
           value: {{ include "iglu.cloudsqlproxy.host" . }}

diff --git a/charts/snowplow-iglu-server/values.yaml b/charts/snowplow-iglu-server/values.yaml
@@ -13,7 +13,7 @@ service:
   port: 8080
   image:
     repository: "snowplow/iglu-server"
-    tag: "0.8.7"
+    tag: "0.8.7-distroless"
     # -- Whether the repository is public
     isRepositoryPublic: true
     # -- The image pullPolicy to use