diff --git a/smardigo/templates/iam/_helpers.tpl b/smardigo/templates/iam/_helpers.tpl deleted file mode 100644 index 1ba85f4..0000000 --- a/smardigo/templates/iam/_helpers.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "iam.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "iam.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "chartName" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Labels that should be added on each resource -*/}} -{{- define "labels" -}} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- if eq (default "helm" .Values.creator) "helm" }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -helm.sh/chart: {{ include "chartName" . }} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/smardigo/templates/iam/monitoring.yml b/smardigo/templates/iam/monitoring.yml index 5d71fb2..1de5b0b 100644 --- a/smardigo/templates/iam/monitoring.yml +++ b/smardigo/templates/iam/monitoring.yml @@ -2,13 +2,13 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: iam + name: "iam" labels: - release: prometheus + release: "prometheus" spec: selector: matchLabels: - app: iam + app: "iam" namespaceSelector: matchNames: - "{{ .Release.Namespace }}"