Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[MULTICLOUD] Uses new tpls for repos / images
[oom.git]
/
kubernetes
/
multicloud
/
components
/
multicloud-prometheus
/
templates
/
configmap.yaml
diff --git
a/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
b/kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
similarity index 94%
rename from
kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
rename to
kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
index
0f0b59f
..
471c909
100644
(file)
--- a/
kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
+++ b/
kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
@@
-14,8
+14,6
@@
# limitations under the License.
*/}}
# limitations under the License.
*/}}
-{{- if .Values.global.prometheus.enabled -}}
-
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
@@
-27,6
+25,4
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
-
-{{- end -}}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file