Allow hostAliases definition (#109)

* Add common.tplvalues helpers * Add ability to define hostAliases * Update version in Chart.yaml * correct syntaxe with simpler way * update with review * change version of the chart * Revert "change version of the chart" This reverts commit a1ad137. * remove bump version + add more comments about hostAliases * fix lint empty-lines * fix ci trailing-spaces from commit 29d2466 --------- Co-authored-by: Jean-Michel Crepel <[email protected]> Co-authored-by: Emilien Devos <[email protected]>
georchestra · Sep 17, 2024 · 509ff70 · 509ff70
1 parent 2b0c631
commit 509ff70
Show file tree

Hide file tree

Showing 18 changed files with 76 additions and 1 deletion.
diff --git a/templates/analytics/analytics-deployment.yaml b/templates/analytics/analytics-deployment.yaml
@@ -69,4 +69,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases  | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/cas/cas-deployment.yaml b/templates/cas/cas-deployment.yaml
@@ -71,4 +71,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/console/console-deployment.yaml b/templates/console/console-deployment.yaml
@@ -78,4 +78,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8  }}
+      {{- end }}
 {{- end }}
diff --git a/templates/datafeeder/datafeeder-deployment.yaml b/templates/datafeeder/datafeeder-deployment.yaml
@@ -128,4 +128,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/datafeeder/import-deployment.yaml b/templates/datafeeder/import-deployment.yaml
@@ -73,4 +73,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml
@@ -78,4 +78,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/geonetwork/elasticsearch/es-deployment.yaml b/templates/geonetwork/elasticsearch/es-deployment.yaml
@@ -60,5 +60,9 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
 
diff --git a/templates/geonetwork/geonetwork-deployment.yaml b/templates/geonetwork/geonetwork-deployment.yaml
@@ -120,4 +120,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/geonetwork/kibana/kibana-deployment.yaml b/templates/geonetwork/kibana/kibana-deployment.yaml
@@ -45,4 +45,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml b/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml
@@ -90,4 +90,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/templates/geoserver/geoserver-deployment.yaml b/templates/geoserver/geoserver-deployment.yaml
@@ -260,4 +260,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/geowebcache/geowebcache-deployment.yaml b/templates/geowebcache/geowebcache-deployment.yaml
@@ -110,4 +110,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/header/header-deployment.yaml b/templates/header/header-deployment.yaml
@@ -81,5 +81,9 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
 
diff --git a/templates/ldap/openldap-deployment.yaml b/templates/ldap/openldap-deployment.yaml
@@ -88,4 +88,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/mapstore/mapstore-deployment.yaml b/templates/mapstore/mapstore-deployment.yaml
@@ -94,5 +94,9 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
 
diff --git a/templates/security-proxy/security-proxy-deployment.yaml b/templates/security-proxy/security-proxy-deployment.yaml
@@ -118,4 +118,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/templates/smtp-smarthost/smtp-deployment.yaml b/templates/smtp-smarthost/smtp-deployment.yaml
@@ -68,4 +68,8 @@ spec:
       tolerations:
         {{- $webapp.tolerations | toYaml | nindent 8 }}
       {{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+        {{- .Values.hostAliases | toYaml | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/values.yaml b/values.yaml
@@ -115,7 +115,7 @@ georchestra:
         harvester_logs:
           enabled: false
           schedule: "0 1 * * *"
-        tolerations: [] 
+        tolerations: []
       service:
         annotations: {}
     geoserver:
@@ -392,3 +392,10 @@ rabbitmq:
 #    pv_name: rabbitmq-data
 #    storage_class_name: default
 #    size: 1Gi
+
+# Allow to override /etc/hosts for ALL apps
+# https://kubernetes.io/docs/tasks/network/customize-hosts-file-for-pods/
+hostAliases: []
+# - ip: "127.0.0.1"
+#   hostnames:
+#   - "host.alias.com"