From ef0ea0507b2cd831bd9c11eb27e66312f27e7f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Wed, 27 Jan 2021 09:46:59 +0100 Subject: [PATCH] [bitnami/kiam] Add hostAliases (#5250) --- bitnami/kiam/Chart.yaml | 2 +- bitnami/kiam/README.md | 4 +++- bitnami/kiam/templates/agent/agent-daemonset.yaml | 3 +++ bitnami/kiam/templates/server/server-daemonset.yaml | 3 +++ bitnami/kiam/templates/server/server-deployment.yaml | 3 +++ bitnami/kiam/values.yaml | 10 ++++++++++ 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/bitnami/kiam/Chart.yaml b/bitnami/kiam/Chart.yaml index 34dc72a31e..650beac95f 100644 --- a/bitnami/kiam/Chart.yaml +++ b/bitnami/kiam/Chart.yaml @@ -23,4 +23,4 @@ name: kiam sources: - https://github.com/bitnami/bitnami-docker-kiam - https://github.com/uswitch/kiam -version: 0.2.4 +version: 0.3.0 diff --git a/bitnami/kiam/README.md b/bitnami/kiam/README.md index 563c09f053..15f4664406 100644 --- a/bitnami/kiam/README.md +++ b/bitnami/kiam/README.md @@ -97,6 +97,7 @@ The following tables lists the configurable parameters of the kiam chart and the | `server.tlsFiles.cert` | Base64-encoded certificate to use with the container | `nil` | | `server.tlsFiles.key` | Base64-encoded key to use with the container | `nil` | | `server.tlsCerts.certFileName` | Name of the certificate filename | `cert.pem` | +| `server.hostAliases` | Add deployment host aliases | `[]` | | `server.tlsCerts.keyFileName` | Name of the certificate filename | `key.pem` | | `server.tlsCerts.caFileName` | Name of the certificate filename | `ca.pem` | | `server.gatewayTimeoutCreation` | Timeout when creating the kiam gateway | `1s` | @@ -157,6 +158,7 @@ The following tables lists the configurable parameters of the kiam chart and the | `agent.extraArgs` | Extra arguments to add to the default kiam command | `[]` | | `agent.command` | Override kiam default command | `[]` | | `agent.args` | Override kiam default args | `[]` | +| `agent.hostAliases` | Add deployment host aliases | `[]` | | `agent.logLevel` | Logging level | `info` | | `agent.sslCertHostPath` | Path to the host system SSL certificates (necessary for contacting the AWS metadata agent) | `/etc/ssl/certs` | | `agent.tlsFiles.ca` | Base64-encoded CA to use with the container | `nil` | @@ -237,7 +239,7 @@ The following tables lists the configurable parameters of the kiam chart and the | Parameter | Description | Default | |---------------------------------------------------|------------------------------------------------------------------------------|--------------------------------------------------------------| | `agent.metrics.enabled` | Enable exposing kiam statistics | `false` | -| `agent.metrics.port` | Service HTTP management port | `9990` | +| `agent.metrics.port` | Service HTTP management port | `9990` | | `agent.metrics.syncInterval` | Metrics synchronization interval statistics | `5s` | | `agent.metrics.annotations` | Annotations for enabling prometheus to access the metrics endpoints | `{prometheus.io/scrape: "true", prometheus.io/port: "9990"}` | | `agent.metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `false` | diff --git a/bitnami/kiam/templates/agent/agent-daemonset.yaml b/bitnami/kiam/templates/agent/agent-daemonset.yaml index fad9d8c207..0db3528ed6 100644 --- a/bitnami/kiam/templates/agent/agent-daemonset.yaml +++ b/bitnami/kiam/templates/agent/agent-daemonset.yaml @@ -30,6 +30,9 @@ spec: {{- end }} spec: {{- include "kiam.imagePullSecrets" . | nindent 6 }} + {{- if .Values.agent.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.agent.hostAliases "context" $) | nindent 8 }} + {{- end }} serviceAccountName: {{ template "kiam.agent.serviceAccountName" . }} dnsPolicy: {{ .Values.agent.dnsPolicy }} hostNetwork: {{ .Values.agent.useHostNetwork }} diff --git a/bitnami/kiam/templates/server/server-daemonset.yaml b/bitnami/kiam/templates/server/server-daemonset.yaml index 27a56eba86..13f6e08a8c 100644 --- a/bitnami/kiam/templates/server/server-daemonset.yaml +++ b/bitnami/kiam/templates/server/server-daemonset.yaml @@ -30,6 +30,9 @@ spec: {{- end }} spec: {{- include "kiam.imagePullSecrets" . | nindent 6 }} + {{- if .Values.server.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.server.hostAliases "context" $) | nindent 8 }} + {{- end }} serviceAccountName: {{ template "kiam.server.serviceAccountName" . }} dnsPolicy: {{ .Values.server.dnsPolicy }} hostNetwork: {{ .Values.server.useHostNetwork }} diff --git a/bitnami/kiam/templates/server/server-deployment.yaml b/bitnami/kiam/templates/server/server-deployment.yaml index 014a7697c1..905a8b277f 100644 --- a/bitnami/kiam/templates/server/server-deployment.yaml +++ b/bitnami/kiam/templates/server/server-deployment.yaml @@ -31,6 +31,9 @@ spec: {{- end }} spec: {{- include "kiam.imagePullSecrets" . | nindent 6 }} + {{- if .Values.server.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.server.hostAliases "context" $) | nindent 8 }} + {{- end }} serviceAccountName: {{ template "kiam.server.serviceAccountName" . }} dnsPolicy: {{ .Values.server.dnsPolicy }} hostNetwork: {{ .Values.server.useHostNetwork }} diff --git a/bitnami/kiam/values.yaml b/bitnami/kiam/values.yaml index 4c38ea2cbc..0cac4e1335 100644 --- a/bitnami/kiam/values.yaml +++ b/bitnami/kiam/values.yaml @@ -91,6 +91,11 @@ server: ## resourceType: daemonset + ## Deployment pod host aliases + ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ + ## + hostAliases: [] + ## Whether the kiam server should use host network ## useHostNetwork: false @@ -443,6 +448,11 @@ agent: ## allowRouteRegExp: + ## Deployment pod host aliases + ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ + ## + hostAliases: [] + ## Host networking settings ## containerPort: 8183