fix: bring back previous labels [run-int-tests]

Author: omrozowicz-splunk

charts/splunk-connect-for-snmp/templates/_helpers.tpl

@@ -218,20 +218,4 @@ MongoDB replica set hosts (comma-separated)
   {{- $hosts = append $hosts (printf "%s-mongodb-%d.%s-mongodb-headless.%s.svc.cluster.local:27017" $.Release.Name $i $.Release.Name $.Release.Namespace ) -}}
 {{- end -}}
 {{- join "," $hosts -}}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "splunk-connect-for-snmp.mongodb.selectorLabels" -}}
-app.kubernetes.io/name: {{ .Release.Name }}-mongodb
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "splunk-connect-for-snmp.mongodb.labels" -}}
-{{ include "splunk-connect-for-snmp.mongodb.selectorLabels" . }}
-{{ include "splunk-connect-for-snmp.labels" . }}
-{{- end }}
+{{- end -}}

charts/splunk-connect-for-snmp/templates/mongodb/mongod-secret-replicaKey.yaml

@@ -4,8 +4,7 @@ kind: Secret
 metadata:
   name: {{ .Release.Name }}-mongodb-replicakey
   labels:
-    {{- include "splunk-connect-for-snmp.labels" . | nindent 4 }}
-    app.kubernetes.io/name: {{ .Release.Name }}-mongodb
+    app: {{ .Release.Name }}-mongodb
 type: Opaque
 data:
   replica-key: {{ randAlphaNum 64 | b64enc | quote }}

charts/splunk-connect-for-snmp/templates/mongodb/mongodb-ha-statefulset.yaml

@@ -9,9 +9,11 @@ metadata:
 spec:
   serviceName: {{ .Release.Name }}-mongodb-headless
   replicas: {{ .Values.mongodb.replicaCount | default 3 }}
+
   selector:
     matchLabels:
-      {{- include "splunk-connect-for-snmp.mongodb.selectorLabels" . | nindent 6 }}
+      app: {{ .Release.Name }}-mongodb
+
   template:
     metadata:
       labels:

charts/splunk-connect-for-snmp/templates/mongodb/mongodb-init-rs-job.yaml

@@ -4,8 +4,7 @@ kind: Job
 metadata:
   name: {{ .Release.Name }}-mongodb-init-rs
   labels:
-    {{- include "splunk-connect-for-snmp.labels" . | nindent 4 }}
-    app.kubernetes.io/name: {{ .Release.Name }}-mongodb-init
+    app: {{ .Release.Name }}-mongodb-init
 spec:
   backoffLimit: 10
   ttlSecondsAfterFinished: 600

charts/splunk-connect-for-snmp/templates/mongodb/mongodb-secret.yaml

@@ -5,8 +5,7 @@ metadata:
   name: {{ .Release.Name }}-mongodb-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "splunk-connect-for-snmp.labels" . | nindent 4 }}
-    app.kubernetes.io/name: {{ .Release.Name }}-mongodb
+    app: {{ .Release.Name }}-mongodb
 type: Opaque
 data:
   root-user: {{ .Values.mongodb.auth.rootUser | default "root" | b64enc | quote }}

charts/splunk-connect-for-snmp/templates/mongodb/mongodb-standalone-statefulset.yaml

@@ -15,9 +15,11 @@ metadata:
 spec:
   serviceName: {{ .Release.Name }}-mongodb
   replicas: 1
+
   selector:
     matchLabels:
       {{- include "splunk-connect-for-snmp.mongodb.selectorLabels" . | nindent 6 }}
+
   template:
     metadata:
       labels:

charts/splunk-connect-for-snmp/templates/mongodb/service-headless.yaml

@@ -3,9 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-mongodb-headless
-  labels:
-    {{- include "splunk-connect-for-snmp.labels" . | nindent 4 }}
-    app.kubernetes.io/name: {{ .Release.Name }}-mongodb
 spec:
   clusterIP: None
   ports:

charts/splunk-connect-for-snmp/templates/mongodb/service.yaml

@@ -2,9 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-mongodb
-  labels:
-    {{- include "splunk-connect-for-snmp.labels" . | nindent 4 }}
-    app.kubernetes.io/name: {{ .Release.Name }}-mongodb
 spec:
   type: ClusterIP
   ports: