fix(ndm-exporters): changed exporter service common label (#647)

* changed exporter service to use common label * bumped chart version * fix alignment in exporter services * fix indentation problem with the ndm ds, operators and exporters templates Signed-off-by: Abhishek Agarwal <[email protected]>
openebs-archive · Nov 26, 2021 · 669c5f6 · 669c5f6
1 parent beb21ae
commit 669c5f6
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 25 deletions.
diff --git a/deploy/helm/charts/templates/_helpers.tpl b/deploy/helm/charts/templates/_helpers.tpl
@@ -85,7 +85,7 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 
 {{- define "openebs-ndm.exporter.name" -}}
-{{- $ndmName := default .Chart.Name .Values.ndmExporter.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- $ndmName := .Chart.Name | trunc 63 | trimSuffix "-" }}
 {{- $componentName := "exporter" | trunc 63 | trimSuffix "-" }}
 {{- printf "%s-%s" $ndmName $componentName | trunc 63 | trimSuffix "-" }}
 {{- end }}
@@ -193,7 +193,7 @@ Create labels for ndm operator component
 Create match labels for ndm cluster exporter deployment
 */}}
 {{- define "openebs-ndm.cluster-exporter.matchLabels" -}}
-app: {{ template "openebs-ndm.cluster-exporter.name" . }}
+app: {{ template "openebs-ndm.exporter.name" . }}
 release: {{ .Release.Name }}
 component: {{ default (include "openebs-ndm.cluster-exporter.name" .) .Values.ndmExporter.clusterExporter.componentName }}
 {{- end -}}
@@ -202,7 +202,6 @@ component: {{ default (include "openebs-ndm.cluster-exporter.name" .) .Values.nd
 Create component labels for ndm cluster exporter component
 */}}
 {{- define "openebs-ndm.cluster-exporter.componentLabels" -}}
-name: {{ template "openebs-ndm.exporter.name" . }}
 openebs.io/component-name: {{ default (include "openebs-ndm.cluster-exporter.name" .) .Values.ndmExporter.clusterExporter.componentName }}
 {{- end -}}
 
@@ -220,7 +219,7 @@ Create labels for ndm cluster exporter component
 Create match labels for ndm node exporter deployment
 */}}
 {{- define "openebs-ndm.node-exporter.matchLabels" -}}
-app: {{ template "openebs-ndm.node-exporter.name" . }}
+app: {{ template "openebs-ndm.exporter.name" . }}
 release: {{ .Release.Name }}
 component: {{ default (include "openebs-ndm.node-exporter.name" .) .Values.ndmExporter.nodeExporter.componentName }}
 {{- end -}}
@@ -229,7 +228,6 @@ component: {{ default (include "openebs-ndm.node-exporter.name" .) .Values.ndmEx
 Create component labels for ndm node exporter component
 */}}
 {{- define "openebs-ndm.node-exporter.componentLabels" -}}
-name: {{ template "openebs-ndm.exporter.name" . }}
 openebs.io/component-name: {{ default (include "openebs-ndm.node-exporter.name" .) .Values.ndmExporter.nodeExporter.componentName }}
 {{- end -}}
 

diff --git a/deploy/helm/charts/templates/cluster-exporter-service.yaml b/deploy/helm/charts/templates/cluster-exporter-service.yaml
@@ -13,6 +13,6 @@ spec:
       targetPort: {{ .Values.ndmExporter.clusterExporter.metricsPort }}
   selector:
     {{- with .Values.ndmExporter.clusterExporter.podLabels }}
-      {{ toYaml . }}
-      {{- end }}
+    {{ toYaml . }}
+    {{- end }}
   {{- end }}
diff --git a/deploy/helm/charts/templates/cluster-exporter.yaml b/deploy/helm/charts/templates/cluster-exporter.yaml
@@ -16,9 +16,9 @@ spec:
     metadata:
       labels:
         {{- include "openebs-ndm.cluster-exporter.labels" . | nindent 8 }}
-          {{- with .Values.ndmExporter.clusterExporter.podLabels }}
-          {{ toYaml . | nindent 8 }}
-          {{- end }}
+        {{- with .Values.ndmExporter.clusterExporter.podLabels }}
+        {{ toYaml . }}
+        {{- end }}
     spec:
       serviceAccountName: {{ template "openebs-ndm.serviceAccountName" . }}
       containers:

diff --git a/deploy/helm/charts/templates/daemonset.yaml b/deploy/helm/charts/templates/daemonset.yaml
@@ -22,7 +22,7 @@ spec:
       labels:
         {{- include "openebs-ndm.labels" . | nindent 8 }}
         {{- with .Values.ndm.podLabels}}
-        {{ toYaml . | nindent 8 }}
+        {{ toYaml . }}
         {{- end}}
     spec:
       serviceAccountName: {{ template "openebs-ndm.serviceAccountName" . }}

diff --git a/deploy/helm/charts/templates/deployment.yaml b/deploy/helm/charts/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
       labels:
         {{- include "openebs-ndm.operator.labels" . | nindent 8 }}
         {{- with .Values.ndmOperator.podLabels}}
-        {{ toYaml . | nindent 8 }}
+        {{ toYaml . }}
         {{- end}}
     spec:
       serviceAccountName: {{ template "openebs-ndm.serviceAccountName" . }}

diff --git a/deploy/helm/charts/templates/node-exporter-service.yaml b/deploy/helm/charts/templates/node-exporter-service.yaml
@@ -13,6 +13,6 @@ spec:
       targetPort: {{ .Values.ndmExporter.nodeExporter.metricsPort }}
   selector:
     {{- with .Values.ndmExporter.nodeExporter.podLabels }}
-      {{ toYaml . }}
-      {{- end }}
+    {{ toYaml . }}
+    {{- end }}
   {{- end }}
diff --git a/deploy/helm/charts/templates/node-exporter.yaml b/deploy/helm/charts/templates/node-exporter.yaml
@@ -15,9 +15,9 @@ spec:
     metadata:
       labels:
         {{- include "openebs-ndm.node-exporter.labels" . | nindent 8 }}
-          {{- with .Values.ndmExporter.nodeExporter.podLabels }}
-          {{ toYaml . | nindent 8 }}
-          {{- end }}
+        {{- with .Values.ndmExporter.nodeExporter.podLabels }}
+        {{ toYaml . }}
+        {{- end }}
     spec:
       serviceAccountName: {{ template "openebs-ndm.serviceAccountName" . }}
       containers:

diff --git a/deploy/ndm-operator.yaml b/deploy/ndm-operator.yaml
@@ -725,8 +725,7 @@ metadata:
   name: ndm-cluster-exporter-service
   namespace: openebs
   labels:
-    name: openebs-ndm-exporter
-    component: openebs-ndm-cluster-exporter
+    app: openebs-ndm-exporter
 spec:
   clusterIP: None
   ports:
@@ -790,8 +789,7 @@ metadata:
   name: ndm-node-exporter-service
   namespace: openebs
   labels:
-    name: openebs-ndm-exporter
-    component: openebs-ndm-node-exporter
+    app: openebs-ndm-exporter
 spec:
   clusterIP: None
   ports:

diff --git a/deploy/yamls/ndm-cluster-exporter.yaml b/deploy/yamls/ndm-cluster-exporter.yaml
@@ -51,8 +51,7 @@ metadata:
   name: ndm-cluster-exporter-service
   namespace: openebs
   labels:
-    name: openebs-ndm-exporter
-    component: openebs-ndm-cluster-exporter
+    app: openebs-ndm-exporter
 spec:
   clusterIP: None
   ports:

diff --git a/deploy/yamls/ndm-node-exporter.yaml b/deploy/yamls/ndm-node-exporter.yaml
@@ -52,8 +52,7 @@ metadata:
   name: ndm-node-exporter-service
   namespace: openebs
   labels:
-    name: openebs-ndm-exporter
-    component: openebs-ndm-node-exporter
+    app: openebs-ndm-exporter
 spec:
   clusterIP: None
   ports: