Merge pull request #130 from bedag/feat/enable-setting-hostaliases-in…

…-common [common]: enable host aliases in common chart
bedag · Apr 18, 2024 · 8342aa7 · 8342aa7
2 parents 603d8c8 + 0bacd0b
commit 8342aa7
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 2 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common
 description: "Bedag's common Helm chart to use for creating other Helm charts"
-version: 10.11.0
+version: 10.12.0
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives

diff --git a/charts/common/README.md b/charts/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 10.11.0](https://img.shields.io/badge/Version-10.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 10.12.0](https://img.shields.io/badge/Version-10.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Bedag's common Helm chart to use for creating other Helm charts
 

diff --git a/charts/common/ci/values.test.yaml b/charts/common/ci/values.test.yaml
@@ -80,6 +80,15 @@ components:
     controller:
       deploy: true
       type: "Deployment"
+      hostAliases:
+      - ip: "127.0.0.1"
+        hostnames:
+        - "foo.local"
+        - "bar.local"
+      - ip: "10.1.2.3"
+        hostnames:
+        - "foo.remote"
+        - "bar.remote"
 
       containers:
         container-1:
@@ -208,6 +217,15 @@ components:
           volumeAttributes:
             secretProviderClass: "azure-kvname"
 
+      hostAliases:
+      - ip: "127.0.0.1"
+        hostnames:
+        - "foo.local"
+        - "bar.local"
+      - ip: "10.1.2.3"
+        hostnames:
+        - "foo.remote"
+        - "bar.remote"
       containers:
         container-1:
           image:
@@ -285,6 +303,16 @@ components:
         runAsNonRoot: true
         runAsUser: 1001
 
+      hostAliases:
+      - ip: "127.0.0.1"
+        hostnames:
+        - "foo.local"
+        - "bar.local"
+      - ip: "10.1.2.3"
+        hostnames:
+        - "foo.remote"
+        - "bar.remote"
+
       # start containers
       # dictionary of containers in a pod
       containers:
@@ -345,6 +373,16 @@ components:
         runAsNonRoot: true
         runAsUser: 1001
 
+      hostAliases:
+      - ip: "127.0.0.1"
+        hostnames:
+        - "foo.local"
+        - "bar.local"
+      - ip: "10.1.2.3"
+        hostnames:
+        - "foo.remote"
+        - "bar.remote"
+
       # start containers
       # dictionary of containers in a pod
       containers:

diff --git a/charts/common/templates/_pod.yaml b/charts/common/templates/_pod.yaml
@@ -19,6 +19,13 @@ Distinguish between sensitive and non-sensitive config, first initialize empty d
   {{- end }}
 {{- end }}
 
+{{- if $controllerValues.hostAliases }}
+hostAliases:
+  {{- with $controllerValues.hostAliases }}
+  {{- toYaml . | nindent 2 }}
+  {{- end -}}
+{{- end }}
+
 {{- if $controllerValues.serviceAccountName }}
 serviceAccountName: {{ $controllerValues.serviceAccountName | quote }}
 {{- end }}

diff --git a/charts/common/values.schema.json b/charts/common/values.schema.json
@@ -1090,6 +1090,24 @@
                     ]
                   }
                 },
+                "hostAliases": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "ip": {
+                        "type": "string"
+                      },
+                      "hostnames": {
+                        "type": "array"
+                      }
+                    },
+                    "required": [
+                      "ip",
+                      "hostnames"
+                    ]
+                  }
+                },
                 "containers": {
                   "type": "object",
                   "patternProperties": {

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -499,6 +499,18 @@ components:
       #   END ONLY FOR CSI
       # end pod
 
+      # hostAliases defines host names for IP addresses
+      # see also https://kubernetes.io/docs/tasks/network/customize-hosts-file-for-pods/#adding-additional-entries-with-hostaliases
+      # hostAliases: {}
+      # - ip: "127.0.0.1"
+      #   hostnames:
+      #   - "foo.local"
+      #   - "bar.local"
+      # - ip: "10.1.2.3"
+      #   hostnames:
+      #   - "foo.remote"
+      #   - "bar.remote"
+
       # start containers
       # dictionary of containers in a pod
       containers: {}