summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-09-19 15:22:12 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-19 15:22:12 +0000
commit11da19b7ee211441386aa15b8d0037d5160a96bf (patch)
tree67db4d95f9d690d3152980cea99c228e11689b7f
parent5be6e479c484c27aff21b960ea0605cefa84947b (diff)
parent956bebf153e336903d97b3bbe07b2bf030ed1cc1 (diff)
Merge "Backup Task: consul configmap enabelling"
-rw-r--r--kubernetes/consul/templates/configmap.yaml10
-rw-r--r--kubernetes/consul/templates/secrets.yaml5
2 files changed, 15 insertions, 0 deletions
diff --git a/kubernetes/consul/templates/configmap.yaml b/kubernetes/consul/templates/configmap.yaml
index 622d5c623e..56b34790f9 100644
--- a/kubernetes/consul/templates/configmap.yaml
+++ b/kubernetes/consul/templates/configmap.yaml
@@ -18,6 +18,11 @@ kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/consul-agent-config/*").AsConfig . | indent 2 }}
---
@@ -26,5 +31,10 @@ kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-scripts-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/consul-agent-config/scripts/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/consul/templates/secrets.yaml b/kubernetes/consul/templates/secrets.yaml
index eb0d02c10f..7cc711075e 100644
--- a/kubernetes/consul/templates/secrets.yaml
+++ b/kubernetes/consul/templates/secrets.yaml
@@ -17,5 +17,10 @@ kind: Secret
metadata:
name: {{ include "common.fullname" . }}-certs-secret
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/consul-agent-config/certs/*").AsSecrets . | indent 2 }}