[bitnami/elasticsearch] Add hostAliases (#5224)

* [bitnami/elasticsearch] Add hostAliases

* Update metrics-deploy.yaml
This commit is contained in:
Javier J. Salmerón-García
2021-01-27 09:41:46 +01:00
committed by GitHub
parent b65d4dbd00
commit 038862f1d3
8 changed files with 70 additions and 6 deletions

View File

@@ -25,4 +25,4 @@ name: elasticsearch
sources:
- https://github.com/bitnami/bitnami-docker-elasticsearch
- https://www.elastic.co/products/elasticsearch
version: 14.0.1
version: 14.1.0

View File

@@ -88,6 +88,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
| `master.service.loadBalancerIP` | loadBalancerIP if master-eligible nodes service type is `LoadBalancer` | `nil` |
| `master.resources` | CPU/Memory resource requests/limits for master-eligible nodes pods | `requests: { cpu: "25m", memory: "256Mi" }` |
| `master.podAnnotations` | Annotations for master pods. | `{}` |
| `master.hostAliases` | Add deployment host aliases | `[]` |
| `master.podAffinityPreset` | Master-eligible Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `master.podAntiAffinityPreset` | Master-eligible Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `master.nodeAffinityPreset.type` | Master-eligible Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
@@ -123,6 +124,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
| `master.serviceAccount.name` | Name of the created serviceAccount | Generated using the `elasticsearch.master.fullname` template |
| `clusterDomain` | Kubernetes cluster domain | `cluster.local` |
| `coordinating.replicas` | Desired number of Elasticsearch coordinating-only nodes | `2` |
| `coordinating.hostAliases` | Add deployment host aliases | `[]` |
| `coordinating.updateStrategy.type` | Update strategy for Coordinating Deployment | `RollingUpdate` |
| `coordinating.heapSize` | Coordinating-only node heap size | `128m` |
| `coordinating.podAnnotations` | Annotations for coordniating pods. | `{}` |
@@ -159,6 +161,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
| `coordinating.serviceAccount.name` | Name of the created serviceAccount | Generated using the `elasticsearch.coordinating.fullname` |
| `data.name` | Data node pod name | `data` |
| `data.replicas` | Desired number of Elasticsearch data nodes | `3` |
| `data.hostAliases` | Add deployment host aliases | `[]` |
| `data.updateStrategy.type` | Update strategy for Data statefulset | `RollingUpdate` |
| `data.updateStrategy.rollingUpdatePartition` | Partition update strategy for Data statefulset | `nil` |
| `data.heapSize` | Data node heap size | `1024m` |
@@ -201,6 +204,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
| `ingest.name` | Ingest node pod name | `ingest` |
| `ingest.replicas` | Desired number of Elasticsearch ingest nodes | `2` |
| `ingest.heapSize` | Ingest node heap size | `128m` |
| `ingest.hostAliases` | Add deployment host aliases | `[]` |
| `ingest.service.type` | Kubernetes Service type (ingest nodes) | `ClusterIP` |
| `ingest.service.port` | Kubernetes Service port Elasticsearch transport port (ingest nodes) | `9300` |
| `ingest.service.nodePort` | Kubernetes Service nodePort (ingest nodes) | `nil` |
@@ -272,6 +276,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
| `curator.envFromSecrets.*.from.key` | - `secretKeyRef.key` used for environment variable | |
| `metrics.enabled` | Enable prometheus exporter | `false` |
| `metrics.name` | Metrics pod name | `metrics` |
| `metrics.hostAliases` | Add deployment host aliases | `[]` |
| `metrics.image.registry` | Metrics exporter image registry | `docker.io` |
| `metrics.image.repository` | Metrics exporter image repository | `bitnami/elasticsearch-exporter` |
| `metrics.image.tag` | Metrics exporter image tag | `1.0.2` |

View File

@@ -29,7 +29,10 @@ spec:
annotations: {{- toYaml . | nindent 10 }}
{{- end }}
spec:
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- if .Values.coordinating.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.coordinating.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.coordinating.affinity }}
affinity: {{- include "elasticsearch.tplValue" (dict "value" .Values.coordinating.affinity "context" $) | nindent 8 }}
{{- else }}

View File

@@ -34,7 +34,7 @@ spec:
annotations: {{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- if .Values.data.affinity }}
affinity: {{- include "elasticsearch.tplValue" (dict "value" .Values.data.affinity "context" $) | nindent 8 }}
{{- else }}
@@ -43,6 +43,9 @@ spec:
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.data.podAntiAffinityPreset "component" "data" "context" $) | nindent 10 }}
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.data.nodeAffinityPreset.type "key" .Values.data.nodeAffinityPreset.key "values" .Values.data.nodeAffinityPreset.values) | nindent 10 }}
{{- end }}
{{- if .Values.data.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.data.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.data.nodeSelector }}
nodeSelector: {{- include "elasticsearch.tplValue" (dict "value" .Values.data.nodeSelector "context" $) | nindent 8 }}
{{- end }}

View File

@@ -25,7 +25,10 @@ spec:
annotations: {{- toYaml . | nindent 10 }}
{{- end }}
spec:
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- if .Values.ingest.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.ingest.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.ingest.affinity }}
affinity: {{- include "elasticsearch.tplValue" (dict "value" .Values.ingest.affinity "context" $) | nindent 8 }}
{{- else }}

View File

@@ -31,7 +31,10 @@ spec:
annotations: {{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- if .Values.master.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.master.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.master.affinity }}
affinity: {{- include "elasticsearch.tplValue" (dict "value" .Values.master.affinity "context" $) | nindent 8 }}
{{- else }}

View File

@@ -25,7 +25,10 @@ spec:
annotations: {{ toYaml . | nindent 8 }}
{{- end }}
spec:
{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
{{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
{{- if .Values.metrics.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.hostAliases "context" $) | nindent 8 }}
{{- end }}
containers:
- name: metrics
image: {{ include "elasticsearch.metrics.image" . }}

View File

@@ -152,10 +152,12 @@ name: elastic
## my_init_script.sh: |
## #!/bin/sh
## echo "Do something."
##
initScripts:
## ConfigMap with scripts to be run at first boot
## Note: This will override initScripts
##
initScriptsCM:
## Secret with init scripts to execute (for sensitive data)
@@ -192,12 +194,18 @@ master:
updateStrategy:
type: RollingUpdate
## Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
heapSize: 128m
## Provide annotations for master-eligible pods.
##
podAnnotations: {}
## Extra labels to add to Pod
##
podLabels: {}
## Pod Security Context for master-eligible pods.
@@ -226,6 +234,7 @@ master:
nodeAffinityPreset:
## Node affinity type
## Allowed values: soft, hard
##
type: ""
## Node label key to match
## E.g.
@@ -262,6 +271,7 @@ master:
## We usually recommend not to specify default resources and to leave this as a conscious
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
##
limits: {}
# cpu: 100m
# memory: 384Mi
@@ -355,6 +365,7 @@ master:
##
serviceAccount:
## Specifies whether a ServiceAccount should be created for the master node
##
create: false
## The name of the ServiceAccount to use.
## If not set and create is true, a name is generated using the fullname template
@@ -367,6 +378,11 @@ coordinating:
##
replicas: 2
## Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
## updateStrategy for ElasticSearch coordinating deployment
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
##
@@ -379,6 +395,7 @@ coordinating:
podAnnotations: {}
## Extra labels to add to Pod
##
podLabels: {}
## Pod Security Context for coordinating-only pods.
@@ -407,6 +424,7 @@ coordinating:
nodeAffinityPreset:
## Node affinity type
## Allowed values: soft, hard
##
type: ""
## Node label key to match
## E.g.
@@ -443,6 +461,7 @@ coordinating:
## We usually recommend not to specify default resources and to leave this as a conscious
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
##
limits: {}
# cpu: 100m
# memory: 384Mi
@@ -506,6 +525,10 @@ data:
## Number of data node(s) replicas to deploy
##
replicas: 2
## Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
## updateStrategy for ElasticSearch Data statefulset
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
##
@@ -518,6 +541,7 @@ data:
podAnnotations: {}
## Extra labels to add to Pod
##
podLabels: {}
## Pod Security Context for data pods.
@@ -546,6 +570,7 @@ data:
nodeAffinityPreset:
## Node affinity type
## Allowed values: soft, hard
##
type: ""
## Node label key to match
## E.g.
@@ -582,6 +607,7 @@ data:
## We usually recommend not to specify default resources and to leave this as a conscious
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
##
limits: {}
# cpu: 100m
# memory: 2176Mi
@@ -671,7 +697,13 @@ ingest:
##
podAnnotations: {}
## Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
## Extra labels to add to Pod
##
podLabels: {}
## Pod Security Context for ingest pods.
@@ -700,6 +732,7 @@ ingest:
nodeAffinityPreset:
## Node affinity type
## Allowed values: soft, hard
##
type: ""
## Node label key to match
## E.g.
@@ -736,6 +769,7 @@ ingest:
## We usually recommend not to specify default resources and to leave this as a conscious
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
##
limits: {}
# cpu: 100m
# memory: 384Mi
@@ -813,6 +847,7 @@ curator:
podAnnotations: {}
## Extra labels to add to Pod
##
podLabels: {}
## Pod affinity preset
@@ -834,6 +869,7 @@ curator:
nodeAffinityPreset:
## Node affinity type
## Allowed values: soft, hard
##
type: ""
## Node label key to match
## E.g.
@@ -1017,6 +1053,12 @@ metrics:
##
# pullSecrets:
# - myRegistryKeySecretName
## Deployment pod host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
## Elasticsearch Prometheus exporter service type
##
service:
@@ -1048,6 +1090,7 @@ metrics:
nodeAffinityPreset:
## Node affinity type
## Allowed values: soft, hard
##
type: ""
## Node label key to match
## E.g.
@@ -1100,6 +1143,7 @@ metrics:
prometheus.io/port: "9114"
## Extra labels to add to Pod
##
podLabels: {}
## Prometheus Operator ServiceMonitor configuration