Generate labels and names using helm templates (#685)

Generate labels and names using helm templates
SumoLogic · May 28, 2020 · bea1ba1 · bea1ba1
1 parent 537b200
commit bea1ba1
Show file tree

Hide file tree

Showing 28 changed files with 378 additions and 94 deletions.
diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl
@@ -23,6 +23,274 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- template "sumologic.fullname" . }}
 {{- end -}}
 
+{{- define "sumologic.labels.app.roles.clusterrole" -}}
+{{- template "sumologic.fullname" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.roles.clusterrolebinding" -}}
+{{- template "sumologic.fullname" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.roles.serviceaccount" -}}
+{{- template "sumologic.fullname" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs" -}}
+{{- template "sumologic.fullname" . }}-fluentd-logs
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs.pod" -}}
+{{- template "sumologic.labels.app.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs.service" -}}
+{{- template "sumologic.labels.app.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs.service-headless" -}}
+{{- template "sumologic.labels.app.logs.service" . }}-headless
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs.configmap" -}}
+{{- template "sumologic.labels.app.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs.statefulset" -}}
+{{- template "sumologic.labels.app.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.logs.hpa" -}}
+{{- template "sumologic.labels.app.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics" -}}
+{{- template "sumologic.fullname" . }}-fluentd-metrics
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics.pod" -}}
+{{- template "sumologic.labels.app.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics.service" -}}
+{{- template "sumologic.labels.app.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics.service-headless" -}}
+{{- template "sumologic.labels.app.metrics.service" . }}-headless
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics.configmap" -}}
+{{- template "sumologic.labels.app.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics.statefulset" -}}
+{{- template "sumologic.labels.app.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.metrics.hpa" -}}
+{{- template "sumologic.labels.app.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.events" -}}
+{{- template "sumologic.fullname" . }}-fluentd-events
+{{- end -}}
+
+{{- define "sumologic.labels.app.events.pod" -}}
+{{- template "sumologic.labels.app.events" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.events.service" -}}
+{{- template "sumologic.labels.app.events" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.events.service-headless" -}}
+{{- template "sumologic.labels.app.events.service" . }}-headless
+{{- end -}}
+
+{{- define "sumologic.labels.app.events.configmap" -}}
+{{- template "sumologic.labels.app.events" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.events.statefulset" -}}
+{{- template "sumologic.labels.app.events" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.otelcol" -}}
+{{- template "sumologic.fullname" . }}-otelcol
+{{- end -}}
+
+{{- define "sumologic.labels.app.otelcol.pod" -}}
+{{- template "sumologic.labels.app.otelcol" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.otelcol.service" -}}
+{{- template "sumologic.labels.app.otelcol" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.otelcol.configmap" -}}
+{{- template "sumologic.labels.app.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.otelcol.deployment" -}}
+{{- template "sumologic.labels.app.otelcol" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.setup" -}}
+{{- template "sumologic.labels.app" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.setup.job" -}}
+{{- template "sumologic.labels.app.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.setup.configmap" -}}
+{{- template "sumologic.labels.app.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.setup.roles.clusterrole" -}}
+{{- template "sumologic.labels.app.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.setup.roles.clusterrolebinding" -}}
+{{- template "sumologic.labels.app.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.app.setup.roles.serviceaccount" -}}
+{{- template "sumologic.labels.app.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.roles.clusterrole" -}}
+{{- template "sumologic.fullname" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.roles.clusterrolebinding" -}}
+{{- template "sumologic.fullname" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.roles.serviceaccount" -}}
+{{- template "sumologic.fullname" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.logs" -}}
+{{ template "sumologic.fullname" . }}-fluentd-logs
+{{- end -}}
+
+{{- define "sumologic.metadata.name.logs.service" -}}
+{{ template "sumologic.metadata.name.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.logs.service-headless" -}}
+{{ template "sumologic.metadata.name.logs.service" . }}-headless
+{{- end -}}
+
+{{- define "sumologic.metadata.name.logs.configmap" -}}
+{{ template "sumologic.metadata.name.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.logs.statefulset" -}}
+{{ template "sumologic.metadata.name.logs" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.metrics" -}}
+{{ template "sumologic.fullname" . }}-fluentd-metrics
+{{- end -}}
+
+{{- define "sumologic.metadata.name.metrics.service" -}}
+{{ template "sumologic.metadata.name.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.metrics.service-headless" -}}
+{{ template "sumologic.metadata.name.metrics.service" . }}-headless
+{{- end -}}
+
+{{- define "sumologic.metadata.name.metrics.configmap" -}}
+{{ template "sumologic.metadata.name.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.metrics.statefulset" -}}
+{{ template "sumologic.metadata.name.metrics" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.events" -}}
+{{ template "sumologic.fullname" . }}-fluentd-events
+{{- end -}}
+
+{{- define "sumologic.metadata.name.events.service" -}}
+{{ template "sumologic.metadata.name.events" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.events.service-headless" -}}
+{{ template "sumologic.metadata.name.events.service" . }}-headless
+{{- end -}}
+
+{{- define "sumologic.metadata.name.events.configmap" -}}
+{{ template "sumologic.metadata.name.events" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.events.statefulset" -}}
+{{ template "sumologic.metadata.name.events" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.otelcol" -}}
+{{ template "sumologic.fullname" . }}-otelcol
+{{- end -}}
+
+{{- define "sumologic.metadata.name.otelcol.service" -}}
+{{ template "sumologic.metadata.name.otelcol" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.otelcol.configmap" -}}
+{{ template "sumologic.metadata.name.otelcol" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.otelcol.deployment" -}}
+{{ template "sumologic.metadata.name.otelcol" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.setup" -}}
+{{ template "sumologic.fullname" . }}-setup
+{{- end -}}
+
+{{- define "sumologic.metadata.name.setup.job" -}}
+{{ template "sumologic.metadata.name.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.setup.configmap" -}}
+{{ template "sumologic.metadata.name.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.setup.roles.clusterrole" -}}
+{{ template "sumologic.metadata.name.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.setup.roles.clusterrolebinding" -}}
+{{ template "sumologic.metadata.name.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.metadata.name.setup.roles.serviceaccount" -}}
+{{ template "sumologic.metadata.name.setup" . }}
+{{- end -}}
+
+{{- define "sumologic.labels.logs" -}}
+sumologic/app: fluentd-logs
+sumologic/component: logs
+{{- end -}}
+
+{{- define "sumologic.labels.metrics" -}}
+sumologic/app: fluentd-metrics
+sumologic/component: metrics
+{{- end -}}
+
+{{- define "sumologic.labels.events" -}}
+sumologic/app: fluentd-events
+sumologic/component: events
+{{- end -}}
+
+{{- define "sumologic.labels.traces" -}}
+sumologic/app: otelcol
+sumologic/component: traces
+{{- end -}}
+
 {{/*
 Create common labels used throughout the chart.
 If dryRun=true, we do not create any chart labels.

diff --git a/deploy/helm/sumologic/templates/chart-configmap.yaml b/deploy/helm/sumologic/templates/chart-configmap.yaml
@@ -3,6 +3,6 @@ kind: ConfigMap
 metadata:
   name: sumologic-configmap
 data:
-  fluentdLogs: {{ template "sumologic.fullname" . }}-fluentd-logs
-  fluentdMetrics: {{ template "sumologic.fullname" . }}-fluentd-metrics
+  fluentdLogs: {{ template "sumologic.metadata.name.logs" . }}
+  fluentdMetrics: {{ template "sumologic.metadata.name.metrics" . }}
   fluentdNamespace: {{ .Release.Namespace }}
diff --git a/deploy/helm/sumologic/templates/clusterrole.yaml b/deploy/helm/sumologic/templates/clusterrole.yaml
@@ -1,9 +1,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "sumologic.fullname" . }}
+  name: {{ template "sumologic.metadata.name.roles.clusterrole" . }}
   labels:
-    app: {{ template "sumologic.labels.app" . }}
+    app: {{ template "sumologic.labels.app.roles.clusterrole" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 rules:
 - apiGroups: ["", "apps", "extensions", "events.k8s.io"]

diff --git a/deploy/helm/sumologic/templates/clusterrolebinding.yaml b/deploy/helm/sumologic/templates/clusterrolebinding.yaml
@@ -1,15 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ template "sumologic.fullname" . }}
+  name: {{ template "sumologic.metadata.name.roles.clusterrolebinding" . }}
   labels:
-    app: {{ template "sumologic.labels.app" . }}
+    app: {{ template "sumologic.labels.app.roles.clusterrolebinding" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 subjects:
 - kind: ServiceAccount
   namespace: {{ .Release.Namespace }}
-  name: {{ template "sumologic.fullname" . }}
+  name: {{ template "sumologic.metadata.name.roles.serviceaccount" . }}
 roleRef:
   kind: ClusterRole
-  name: {{ template "sumologic.fullname" . }}
+  name: {{ template "sumologic.metadata.name.roles.clusterrole" . }}
   apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/helm/sumologic/templates/configmap.yaml b/deploy/helm/sumologic/templates/configmap.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "sumologic.fullname" . }}-fluentd-logs
+  name: {{ template "sumologic.metadata.name.logs.configmap" . }}
   labels:
-    app: {{ template "sumologic.labels.app" . }}-fluentd-logs
+    app: {{ template "sumologic.labels.app.logs.configmap" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 data:
   fluent.conf: |-

diff --git a/deploy/helm/sumologic/templates/events-configmap.yaml b/deploy/helm/sumologic/templates/events-configmap.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-fluentd-events" (include "sumologic.fullname" .) }}
+  name: {{ template "sumologic.metadata.name.events.configmap" . }}
   labels:
-    app: {{ printf "%s-fluentd-events" (include "sumologic.labels.app" .) }}
+    app: {{ template "sumologic.labels.app.events.configmap" . }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 data:
   fluent.conf: |-

diff --git a/deploy/helm/sumologic/templates/events-service-headless.yaml b/deploy/helm/sumologic/templates/events-service-headless.yaml
@@ -2,13 +2,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ printf "%s-fluentd-events-headless" (include "sumologic.fullname" .) }}
+  name: {{ template "sumologic.metadata.name.events.service-headless" . }}
   labels:
-    app: {{ printf "%s-fluentd-events-headless" (include "sumologic.labels.app" .) }}
+    app: {{ template "sumologic.labels.app.events.service-headless" . }}
+    {{- include "sumologic.labels.events" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 spec:
   selector:
-    app: {{ printf "%s-fluentd-events" (include "sumologic.labels.app" .) }}
+    app: {{ template "sumologic.labels.app.events.pod" . }}
   clusterIP: None
   ports:
   - name: metrics

diff --git a/deploy/helm/sumologic/templates/events-service.yaml b/deploy/helm/sumologic/templates/events-service.yaml
@@ -2,13 +2,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ printf "%s-fluentd-events" (include "sumologic.fullname" .) }}
+  name: {{ template "sumologic.metadata.name.events.service" . }}
   labels:
-    app: {{ printf "%s-fluentd-events" (include "sumologic.labels.app" .) }}
+    app: {{ template "sumologic.labels.app.events.service" . }}
+    {{- include "sumologic.labels.events" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
 spec:
   selector:
-    app: {{ printf "%s-fluentd-events" (include "sumologic.labels.app" .) }}
+    app: {{ template "sumologic.labels.app.events.pod" . }}
   ports:
   - name: metrics
     port: 24231