From 752cb536eb960e24fa5fea4c78bb1ed97fc919dd Mon Sep 17 00:00:00 2001 From: Konstanty Karagiorgis Date: Tue, 9 Jun 2020 08:59:50 +0200 Subject: [PATCH] [bitnami/consul] Introduced .Release.Namespace in objects meta (#2761) * [bitnami/consul] Introduced .Release.Namespace in objects meta This PR implements #2006 for consul chart * [bitnami/consul] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/consul/Chart.yaml | 2 +- bitnami/consul/templates/consul-configmap.yaml | 1 + bitnami/consul/templates/consul-service.yaml | 1 + bitnami/consul/templates/gossip-secret.yaml | 1 + bitnami/consul/templates/ingress.yaml | 1 + bitnami/consul/templates/pod-dist-budget.yaml | 1 + bitnami/consul/templates/statefulset.yaml | 1 + bitnami/consul/templates/ui-service.yaml | 1 + bitnami/consul/values-production.yaml | 4 ++-- bitnami/consul/values.yaml | 4 ++-- 10 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bitnami/consul/Chart.yaml b/bitnami/consul/Chart.yaml index 0e233fcbc..7f41d59b6 100644 --- a/bitnami/consul/Chart.yaml +++ b/bitnami/consul/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: consul -version: 7.0.16 +version: 7.1.0 appVersion: 1.7.3 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy. home: https://www.consul.io/ diff --git a/bitnami/consul/templates/consul-configmap.yaml b/bitnami/consul/templates/consul-configmap.yaml index 5277be6d3..9ec438f21 100644 --- a/bitnami/consul/templates/consul-configmap.yaml +++ b/bitnami/consul/templates/consul-configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "consul.fullname" . }}-configuration + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} data: config.json: {{- toYaml .Values.configmap | nindent 4}} diff --git a/bitnami/consul/templates/consul-service.yaml b/bitnami/consul/templates/consul-service.yaml index 3eca9d577..e9e61c78d 100644 --- a/bitnami/consul/templates/consul-service.yaml +++ b/bitnami/consul/templates/consul-service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "consul.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" diff --git a/bitnami/consul/templates/gossip-secret.yaml b/bitnami/consul/templates/gossip-secret.yaml index af208b287..1755d1b72 100644 --- a/bitnami/consul/templates/gossip-secret.yaml +++ b/bitnami/consul/templates/gossip-secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "consul.fullname" . }}-gossip-key + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} type: Opaque data: diff --git a/bitnami/consul/templates/ingress.yaml b/bitnami/consul/templates/ingress.yaml index 6d28db93b..03ea65f7c 100644 --- a/bitnami/consul/templates/ingress.yaml +++ b/bitnami/consul/templates/ingress.yaml @@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ template "consul.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} annotations: {{- if .Values.ingress.certManager }} diff --git a/bitnami/consul/templates/pod-dist-budget.yaml b/bitnami/consul/templates/pod-dist-budget.yaml index 737a4a9f7..2647438be 100644 --- a/bitnami/consul/templates/pod-dist-budget.yaml +++ b/bitnami/consul/templates/pod-dist-budget.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ include "consul.fullname" . }}-pdb + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} spec: {{- if .Values.pdb.minAvailable }} diff --git a/bitnami/consul/templates/statefulset.yaml b/bitnami/consul/templates/statefulset.yaml index fa1859f11..fd00aab9f 100644 --- a/bitnami/consul/templates/statefulset.yaml +++ b/bitnami/consul/templates/statefulset.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ template "consul.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} spec: selector: diff --git a/bitnami/consul/templates/ui-service.yaml b/bitnami/consul/templates/ui-service.yaml index fbcc6a888..7280fb6c4 100644 --- a/bitnami/consul/templates/ui-service.yaml +++ b/bitnami/consul/templates/ui-service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "consul.fullname" . }}-ui + namespace: {{ .Release.Namespace }} labels: {{- include "consul.labels" . | nindent 4 }} annotations: {{- include "consul.tplValue" ( dict "value" .Values.ui.service.annotations "context" $) | nindent 4 }} spec: diff --git a/bitnami/consul/values-production.yaml b/bitnami/consul/values-production.yaml index eb328415a..e6e804d49 100644 --- a/bitnami/consul/values-production.yaml +++ b/bitnami/consul/values-production.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/consul - tag: 1.7.3-debian-10-r11 + tag: 1.7.3-debian-10-r13 ## 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 @@ -330,7 +330,7 @@ metrics: image: registry: docker.io repository: bitnami/consul-exporter - tag: 0.6.0-debian-10-r134 + tag: 0.6.0-debian-10-r136 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bitnami/consul/values.yaml b/bitnami/consul/values.yaml index 77f950dfc..6c05d7051 100644 --- a/bitnami/consul/values.yaml +++ b/bitnami/consul/values.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/consul - tag: 1.7.3-debian-10-r11 + tag: 1.7.3-debian-10-r13 ## 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 @@ -330,7 +330,7 @@ metrics: image: registry: docker.io repository: bitnami/consul-exporter - tag: 0.6.0-debian-10-r134 + tag: 0.6.0-debian-10-r136 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.