From 769740a31b25ff9497ae6ff32d5089a9bfbbceb6 Mon Sep 17 00:00:00 2001 From: David Carrera Date: Mon, 31 Jul 2023 10:04:23 +0100 Subject: [PATCH] add dnsPolicy support in query deployment (#17520) Signed-off-by: David Carrera Signed-off-by: Fran Mulero Co-authored-by: Fran Mulero --- bitnami/thanos/Chart.yaml | 2 +- bitnami/thanos/README.md | 8 ++++ .../templates/bucketweb/deployment.yaml | 3 ++ .../templates/compactor/_pod-template.tpl | 3 ++ .../templates/query-frontend/deployment.yaml | 3 ++ .../thanos/templates/query/deployment.yaml | 3 ++ .../receive-distributor/deployment.yaml | 3 ++ .../thanos/templates/receive/statefulset.yaml | 3 ++ .../thanos/templates/ruler/statefulset.yaml | 3 ++ .../templates/storegateway/statefulset.yaml | 3 ++ bitnami/thanos/values.yaml | 48 +++++++++++++++++++ 11 files changed, 81 insertions(+), 1 deletion(-) diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml index d6e49a1a4c..fe3199c99f 100644 --- a/bitnami/thanos/Chart.yaml +++ b/bitnami/thanos/Chart.yaml @@ -30,4 +30,4 @@ maintainers: name: thanos sources: - https://github.com/bitnami/charts/tree/main/bitnami/thanos -version: 12.9.1 +version: 12.10.0 diff --git a/bitnami/thanos/README.md b/bitnami/thanos/README.md index e0705efe3e..41781fc852 100644 --- a/bitnami/thanos/README.md +++ b/bitnami/thanos/README.md @@ -204,6 +204,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `query.podLabels` | Thanos Query pod labels | `{}` | | `query.podAnnotations` | Annotations for Thanos Query pods | `{}` | | `query.dnsConfig` | Deployment pod DNS config | `{}` | +| `query.dnsPolicy` | Deployment pod DNS policy | `""` | | `query.hostAliases` | Deployment pod host aliases | `[]` | | `query.lifecycleHooks` | for the Thanos Query container(s) to automate configuration before or after startup | `{}` | | `query.priorityClassName` | Thanos Query priorityClassName | `""` | @@ -352,6 +353,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `queryFrontend.podLabels` | Thanos Query Frontend pod labels | `{}` | | `queryFrontend.podAnnotations` | Annotations for Thanos Query Frontend pods | `{}` | | `queryFrontend.dnsConfig` | Deployment pod DNS config | `{}` | +| `queryFrontend.dnsPolicy` | Deployment pod DNS policy | `""` | | `queryFrontend.hostAliases` | Deployment pod host aliases | `[]` | | `queryFrontend.lifecycleHooks` | for the Thanos Query Frontend container(s) to automate configuration before or after startup | `{}` | | `queryFrontend.priorityClassName` | Thanos Query Frontend priorityClassName | `""` | @@ -460,6 +462,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `bucketweb.podLabels` | Thanos Bucket Web pod labels | `{}` | | `bucketweb.podAnnotations` | Annotations for Thanos Bucket Web pods | `{}` | | `bucketweb.dnsConfig` | Deployment pod DNS config | `{}` | +| `bucketweb.dnsPolicy` | Deployment pod DNS policy | `""` | | `bucketweb.hostAliases` | Deployment pod host aliases | `[]` | | `bucketweb.lifecycleHooks` | for the Thanos Bucket Web container(s) to automate configuration before or after startup | `{}` | | `bucketweb.priorityClassName` | Thanos Bucket Web priorityClassName | `""` | @@ -576,6 +579,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `compactor.podLabels` | Thanos Compactor pod labels | `{}` | | `compactor.podAnnotations` | Annotations for Thanos Compactor pods | `{}` | | `compactor.dnsConfig` | Deployment pod DNS config | `{}` | +| `compactor.dnsPolicy` | Deployment pod DNS policy | `""` | | `compactor.hostAliases` | Deployment pod host aliases | `[]` | | `compactor.lifecycleHooks` | for the Thanos Compactor container(s) to automate configuration before or after startup | `{}` | | `compactor.priorityClassName` | Thanos Compactor priorityClassName | `""` | @@ -687,6 +691,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `storegateway.podLabels` | Thanos Store Gateway pod labels | `{}` | | `storegateway.podAnnotations` | Annotations for Thanos Store Gateway pods | `{}` | | `storegateway.dnsConfig` | Deployment pod DNS config | `{}` | +| `storegateway.dnsPolicy` | Deployment pod DNS policy | `""` | | `storegateway.hostAliases` | Deployment pod host aliases | `[]` | | `storegateway.lifecycleHooks` | for the Thanos Store Gateway container(s) to automate configuration before or after startup | `{}` | | `storegateway.priorityClassName` | Thanos Store Gateway priorityClassName | `""` | @@ -831,6 +836,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `ruler.podLabels` | Thanos Ruler pod labels | `{}` | | `ruler.podAnnotations` | Annotations for Thanos Ruler pods | `{}` | | `ruler.dnsConfig` | Deployment pod DNS config | `{}` | +| `ruler.dnsPolicy` | Deployment pod DNS policy | `""` | | `ruler.hostAliases` | Deployment pod host aliases | `[]` | | `ruler.lifecycleHooks` | for the Thanos Ruler container(s) to automate configuration before or after startup | `{}` | | `ruler.priorityClassName` | Thanos Ruler priorityClassName | `""` | @@ -957,6 +963,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `receive.podLabels` | Thanos Receive pod labels | `{}` | | `receive.podAnnotations` | Annotations for Thanos Receive pods | `{}` | | `receive.dnsConfig` | Deployment pod DNS config | `{}` | +| `receive.dnsPolicy` | Deployment pod DNS policy | `""` | | `receive.hostAliases` | Deployment pod host aliases | `[]` | | `receive.lifecycleHooks` | for the Thanos Receive container(s) to automate configuration before or after startup | `{}` | | `receive.priorityClassName` | Thanos Receive priorityClassName | `""` | @@ -1074,6 +1081,7 @@ Check the section [Integrate Thanos with Prometheus and Alertmanager](#integrate | `receiveDistributor.podLabels` | Thanos Receive Distributor pod labels | `{}` | | `receiveDistributor.podAnnotations` | Annotations for Thanos Receive Distributor pods | `{}` | | `receiveDistributor.dnsConfig` | Deployment pod DNS config | `{}` | +| `receiveDistributor.dnsPolicy` | Deployment pod DNS policy | `""` | | `receiveDistributor.hostAliases` | Deployment pod host aliases | `[]` | | `receiveDistributor.lifecycleHooks` | for the Thanos Receive Distributor container(s) to automate configuration before or after startup | `{}` | | `receiveDistributor.priorityClassName` | Thanos Receive Distributor priorityClassName | `""` | diff --git a/bitnami/thanos/templates/bucketweb/deployment.yaml b/bitnami/thanos/templates/bucketweb/deployment.yaml index 0ccbb3e727..c96c90c614 100644 --- a/bitnami/thanos/templates/bucketweb/deployment.yaml +++ b/bitnami/thanos/templates/bucketweb/deployment.yaml @@ -60,6 +60,9 @@ spec: {{- if .Values.bucketweb.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.bucketweb.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.bucketweb.dnsPolicy }} + dnsPolicy: {{ .Values.bucketweb.dnsPolicy | quote }} + {{- end }} {{- if .Values.bucketweb.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.bucketweb.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/templates/compactor/_pod-template.tpl b/bitnami/thanos/templates/compactor/_pod-template.tpl index 6c4a9e12e3..27c9f58612 100644 --- a/bitnami/thanos/templates/compactor/_pod-template.tpl +++ b/bitnami/thanos/templates/compactor/_pod-template.tpl @@ -41,6 +41,9 @@ spec: {{- if .Values.compactor.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.dnsConfig "context" $) | nindent 4 }} {{- end }} + {{- if .Values.compactor.dnsPolicy }} + dnsPolicy: {{ .Values.compactor.dnsPolicy | quote }} + {{- end }} {{- if .Values.compactor.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.nodeSelector "context" $) | nindent 4 }} {{- end }} diff --git a/bitnami/thanos/templates/query-frontend/deployment.yaml b/bitnami/thanos/templates/query-frontend/deployment.yaml index bef4c3fd5e..025a0c4417 100644 --- a/bitnami/thanos/templates/query-frontend/deployment.yaml +++ b/bitnami/thanos/templates/query-frontend/deployment.yaml @@ -65,6 +65,9 @@ spec: {{- if .Values.queryFrontend.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.queryFrontend.dnsPolicy }} + dnsPolicy: {{ .Values.queryFrontend.dnsPolicy | quote }} + {{- end }} {{- if .Values.queryFrontend.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/templates/query/deployment.yaml b/bitnami/thanos/templates/query/deployment.yaml index 8d53d292b3..6958413f76 100644 --- a/bitnami/thanos/templates/query/deployment.yaml +++ b/bitnami/thanos/templates/query/deployment.yaml @@ -64,6 +64,9 @@ spec: {{- if .Values.query.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.query.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.query.dnsPolicy }} + dnsPolicy: {{ .Values.query.dnsPolicy | quote }} + {{- end }} {{- if .Values.query.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.query.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/templates/receive-distributor/deployment.yaml b/bitnami/thanos/templates/receive-distributor/deployment.yaml index 4ca1a6594e..83979bb51b 100644 --- a/bitnami/thanos/templates/receive-distributor/deployment.yaml +++ b/bitnami/thanos/templates/receive-distributor/deployment.yaml @@ -63,6 +63,9 @@ spec: {{- if .Values.receiveDistributor.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.receiveDistributor.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.receiveDistributor.dnsPolicy }} + dnsPolicy: {{ .Values.receiveDistributor.dnsPolicy | quote }} + {{- end }} {{- if .Values.receiveDistributor.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.receiveDistributor.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/templates/receive/statefulset.yaml b/bitnami/thanos/templates/receive/statefulset.yaml index f89a71b0a9..633ffd8e37 100644 --- a/bitnami/thanos/templates/receive/statefulset.yaml +++ b/bitnami/thanos/templates/receive/statefulset.yaml @@ -68,6 +68,9 @@ spec: {{- if .Values.receive.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.receive.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.receive.dnsPolicy }} + dnsPolicy: {{ .Values.receive.dnsPolicy | quote }} + {{- end }} {{- if .Values.receive.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.receive.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/templates/ruler/statefulset.yaml b/bitnami/thanos/templates/ruler/statefulset.yaml index ccd2e0c18e..6a49622e71 100644 --- a/bitnami/thanos/templates/ruler/statefulset.yaml +++ b/bitnami/thanos/templates/ruler/statefulset.yaml @@ -64,6 +64,9 @@ spec: {{- if .Values.ruler.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.ruler.dnsPolicy }} + dnsPolicy: {{ .Values.ruler.dnsPolicy | quote }} + {{- end }} {{- if .Values.ruler.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/templates/storegateway/statefulset.yaml b/bitnami/thanos/templates/storegateway/statefulset.yaml index fbb52d5ee9..b84a028ca7 100644 --- a/bitnami/thanos/templates/storegateway/statefulset.yaml +++ b/bitnami/thanos/templates/storegateway/statefulset.yaml @@ -65,6 +65,9 @@ spec: {{- if .Values.storegateway.dnsConfig }} dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.storegateway.dnsConfig "context" $) | nindent 8 }} {{- end }} + {{- if .Values.storegateway.dnsPolicy }} + dnsPolicy: {{ .Values.storegateway.dnsPolicy | quote }} + {{- end }} {{- if .Values.storegateway.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.storegateway.nodeSelector "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/thanos/values.yaml b/bitnami/thanos/values.yaml index 51a886f52d..682b810e23 100644 --- a/bitnami/thanos/values.yaml +++ b/bitnami/thanos/values.yaml @@ -389,6 +389,12 @@ query: ## - name: single-request-reopen ## dnsConfig: {} + ## @param query.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param query.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -1048,6 +1054,12 @@ queryFrontend: ## - name: single-request-reopen ## dnsConfig: {} + ## @param queryFrontend.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param queryFrontend.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -1485,6 +1497,12 @@ bucketweb: ## - name: single-request-reopen ## dnsConfig: {} + ## @param bucketweb.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param bucketweb.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -1926,6 +1944,12 @@ compactor: ## - name: single-request-reopen ## dnsConfig: {} + ## @param compactor.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param compactor.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -2382,6 +2406,12 @@ storegateway: ## - name: single-request-reopen ## dnsConfig: {} + ## @param storegateway.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param storegateway.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -3019,6 +3049,12 @@ ruler: ## - name: single-request-reopen ## dnsConfig: {} + ## @param ruler.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param ruler.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -3522,6 +3558,12 @@ receive: ## - name: single-request-reopen ## dnsConfig: {} + ## @param receive.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param receive.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -3981,6 +4023,12 @@ receiveDistributor: ## - name: single-request-reopen ## dnsConfig: {} + ## @param receiveDistributor.dnsPolicy Deployment pod DNS policy + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirstWithHostNet + ## + dnsPolicy: "" ## @param receiveDistributor.hostAliases Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ##