Merge pull request #46 from SorsOps/main

Prevent duplicate labels

Author: adishM98

charts/tooljet/templates/_helpers.tpl

@@ -35,13 +35,13 @@ Common labels
 */}}
 {{- define "tooljet.labels" -}}
 helm.sh/chart: {{ include "tooljet.chart" . }}
-{{ include "tooljet.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+
 {{/*
 Selector labels
 */}}

charts/tooljet/templates/deployment-pgrst.yml

@@ -4,24 +4,22 @@ metadata:
   name: {{ include "tooljet.fullname" . }}-postgrest
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
-    app.kubernetes.io/component: tooljet-postgrest
-    app.kubernetes.io/instance: tooljet-postgrest
-    app.kubernetes.io/name: tooljet-postgrest
+    app.kubernetes.io/component: {{ .Release.Name }}-postgrest
+    app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
+    app.kubernetes.io/name: {{ .Release.Name }}-postgrest
 spec:
   replicas: {{ .Values.postgrest.replicaCount | default 1 }}
   selector:
     matchLabels:
-      {{- include "tooljet.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: tooljet-postgrest
-      app.kubernetes.io/instance: tooljet-postgrest
-      app.kubernetes.io/name: tooljet-postgrest
+      app.kubernetes.io/component: {{ .Release.Name }}-postgrest
+      app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
+      app.kubernetes.io/name: {{ .Release.Name }}-postgrest
   template:
     metadata:
       labels:
-        {{- include "tooljet.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: tooljet-postgrest
-        app.kubernetes.io/instance: tooljet-postgrest
-        app.kubernetes.io/name: tooljet-postgrest
+        app.kubernetes.io/component: {{ .Release.Name }}-postgrest
+        app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
+        app.kubernetes.io/name: {{ .Release.Name }}-postgrest
     spec:
       containers:
         - name: postgrest

charts/tooljet/templates/deployment.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "tooljet.fullname" . }}
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
+    {{- include "tooljet.selectorLabels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.apps.tooljet.replicaCount }}

charts/tooljet/templates/ingress.yml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "tooljet.fullname" . }}
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
+    {{- include "tooljet.selectorLabels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

charts/tooljet/templates/secret.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ .Values.apps.tooljet.secret.name }}
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
+    {{- include "tooljet.selectorLabels" . | nindent 4 }}
 type: Opaque
 data:
   {{- if not .Values.external_postgresql.enabled }}

charts/tooljet/templates/service-pgrst.yml

@@ -4,15 +4,14 @@ metadata:
   name: {{ include "tooljet.fullname" . }}-postgrest
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
-    app.kubernetes.io/component: tooljet-postgrest
-    app.kubernetes.io/instance: tooljet-postgrest
-    app.kubernetes.io/name: tooljet-postgrest
+    app.kubernetes.io/component: {{ .Release.Name }}-postgrest
+    app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
+    app.kubernetes.io/name: {{ .Release.Name }}-postgrest
 spec:
   selector:
-    {{- include "tooljet.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: tooljet-postgrest
-    app.kubernetes.io/instance: tooljet-postgrest
-    app.kubernetes.io/name: tooljet-postgrest
+    app.kubernetes.io/component: {{ .Release.Name }}-postgrest
+    app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
+    app.kubernetes.io/name: {{ .Release.Name }}-postgrest
   type: {{ .Values.postgrest.service.type }}
   ports:
     - name: http

charts/tooljet/templates/service.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "tooljet.fullname" . }}
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
+    {{- include "tooljet.selectorLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.apps.tooljet.service.type }}
   ports: