From 231d067d2a6a7d4eeada5705048ea11981a96cd2 Mon Sep 17 00:00:00 2001 From: Nicola Benaglia <52411515+nbenaglia@users.noreply.github.com> Date: Wed, 8 Apr 2020 12:13:40 +0200 Subject: [PATCH] [bitnami/thanos] Add missing podAnnotations (#2250) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add missing podAnnotations * Update comments and README Signed-off-by: Andrés Bono * Bump chart version Signed-off-by: Andrés Bono * [bitnami/thanos] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Andrés Bono Co-authored-by: Bitnami Containers --- bitnami/thanos/Chart.yaml | 2 +- bitnami/thanos/README.md | 5 +++++ bitnami/thanos/values-production.yaml | 27 ++++++++++++++++++++++++++- bitnami/thanos/values.yaml | 27 ++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/bitnami/thanos/Chart.yaml b/bitnami/thanos/Chart.yaml index cf56c2aed..0d60c069b 100644 --- a/bitnami/thanos/Chart.yaml +++ b/bitnami/thanos/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: thanos sources: - https://github.com/bitnami/bitnami-docker-thanos -version: 0.3.1 \ No newline at end of file +version: 0.3.2 diff --git a/bitnami/thanos/README.md b/bitnami/thanos/README.md index b3aba9f1c..bd02d3866 100644 --- a/bitnami/thanos/README.md +++ b/bitnami/thanos/README.md @@ -127,6 +127,7 @@ The following tables lists the configurable parameters of the Thanos chart and t | `querier.securityContext.runAsUser` | User ID for the Thanos Querier container | `1001` | | `querier.resources.limits` | The resources limits for the Thanos Querier container | `{}` | | `querier.resources.requests` | The requested resources for the Thanos Querier container | `{}` | +| `querier.podAnnotations` | Annotations for Thanos Querier pods | `{}` | | `querier.livenessProbe` | Liveness probe configuration for Thanos Querier | `Check values.yaml file` | | `querier.readinessProbe` | Readiness probe configuration for Thanos Querier | `Check values.yaml file` | | `querier.service.type` | Kubernetes service type | `ClusterIP` | @@ -167,6 +168,7 @@ The following tables lists the configurable parameters of the Thanos chart and t | `bucketweb.securityContext.runAsUser` | User ID for the Thanos Bucket Web container | `1001` | | `bucketweb.resources.limits` | The resources limits for the Thanos Bucket Web container | `{}` | | `bucketweb.resources.requests` | The requested resources for the Thanos Bucket Web container | `{}` | +| `bucketweb.podAnnotations` | Annotations for Thanos Bucket Web pods | `{}` | | `bucketweb.livenessProbe` | Liveness probe configuration for Thanos Compactor | `Check values.yaml file` | | `bucketweb.readinessProbe` | Readiness probe configuration for Thanos Compactor | `Check values.yaml file` | | `bucketweb.service.type` | Kubernetes service type | `ClusterIP` | @@ -201,6 +203,7 @@ The following tables lists the configurable parameters of the Thanos chart and t | `compactor.securityContext.runAsUser` | User ID for the Thanos Compactor container | `1001` | | `compactor.resources.limits` | The resources limits for the Thanos Compactor container | `{}` | | `compactor.resources.requests` | The requested resources for the Thanos Compactor container | `{}` | +| `compactor.podAnnotations` | Annotations for Thanos Compactor pods | `{}` | | `compactor.livenessProbe` | Liveness probe configuration for Thanos Compactor | `Check values.yaml file` | | `compactor.readinessProbe` | Readiness probe configuration for Thanos Compactor | `Check values.yaml file` | | `compactor.service.type` | Kubernetes service type | `ClusterIP` | @@ -234,6 +237,7 @@ The following tables lists the configurable parameters of the Thanos chart and t | `storegateway.securityContext.runAsUser` | User ID for the Thanos Store Gateway container | `1001` | | `storegateway.resources.limits` | The resources limits for the Thanos Store Gateway container | `{}` | | `storegateway.resources.requests` | The requested resources for the Thanos Store Gateway container | `{}` | +| `storegateway.podAnnotations` | Annotations for Thanos Store Gateway pods | `{}` | | `storegateway.livenessProbe` | Liveness probe configuration for Thanos Store Gateway | `Check values.yaml file` | | `storegateway.readinessProbe` | Readiness probe configuration for Thanos Store Gateway | `Check values.yaml file` | | `storegateway.service.type` | Kubernetes service type | `ClusterIP` | @@ -278,6 +282,7 @@ The following tables lists the configurable parameters of the Thanos chart and t | `ruler.securityContext.runAsUser` | User ID for the Thanos Ruler container | `1001` | | `ruler.resources.limits` | The resources limits for the Thanos Ruler container | `{}` | | `ruler.resources.requests` | The requested resources for the Thanos Ruler container | `{}` | +| `ruler.podAnnotations` | Annotations for Thanos Ruler pods | `{}` | | `ruler.livenessProbe` | Liveness probe configuration for Thanos Ruler | `Check values.yaml file` | | `ruler.readinessProbe` | Readiness probe configuration for Thanos Ruler | `Check values.yaml file` | | `ruler.service.type` | Kubernetes service type | `ClusterIP` | diff --git a/bitnami/thanos/values-production.yaml b/bitnami/thanos/values-production.yaml index 94bc47f22..729d22734 100644 --- a/bitnami/thanos/values-production.yaml +++ b/bitnami/thanos/values-production.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/thanos - tag: 0.11.0-scratch-r11 + tag: 0.11.0-scratch-r14 ## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -119,6 +119,11 @@ querier: ## tolerations: {} + ## Annotations for querier pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -276,6 +281,11 @@ bucketweb: ## tolerations: {} + ## Annotations for bucketweb pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -415,6 +425,11 @@ compactor: ## tolerations: {} + ## Annotations for compactor pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -559,6 +574,11 @@ storegateway: ## tolerations: {} + ## Annotations for storegateway pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -750,6 +770,11 @@ ruler: ## tolerations: {} + ## Annotations for ruler pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## diff --git a/bitnami/thanos/values.yaml b/bitnami/thanos/values.yaml index dfa121e69..3f67ba1ad 100644 --- a/bitnami/thanos/values.yaml +++ b/bitnami/thanos/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/thanos - tag: 0.11.0-scratch-r11 + tag: 0.11.0-scratch-r14 ## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## @@ -119,6 +119,11 @@ querier: ## tolerations: {} + ## Annotations for querier pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -276,6 +281,11 @@ bucketweb: ## tolerations: {} + ## Annotations for bucketweb pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -415,6 +425,11 @@ compactor: ## tolerations: {} + ## Annotations for compactor pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -559,6 +574,11 @@ storegateway: ## tolerations: {} + ## Annotations for storegateway pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -750,6 +770,11 @@ ruler: ## tolerations: {} + ## Annotations for ruler pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## Pod priority ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ##