Common labels (#8)

* Change on charts, Adding tpl files for both charts + edit deployments * Delete common labels from helpers.tpl --------- Co-authored-by: Mahsa <mahsa.soleimani@snapp.cab>
snapp-incubator · Feb 20, 2024 · eb69d08 · eb69d08
1 parent fe84519
commit eb69d08
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 48 deletions.
diff --git a/clients/harbor-client/charts/templates/_helpers.tpl b/clients/harbor-client/charts/templates/_helpers.tpl
@@ -30,19 +30,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{/*
-Common labels
-*/}}
-{{- define "snappcloud-harbor-client.labels" -}}
-helm.sh/chart: {{ include "snappcloud-harbor-client.chart" . }}
-{{ include "snappcloud-harbor-client.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
 Selector labels
 */}}
 {{- define "snappcloud-harbor-client.selectorLabels" -}}

diff --git a/clients/harbor-client/charts/templates/deployment.yaml b/clients/harbor-client/charts/templates/deployment.yaml
@@ -2,8 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "snappcloud-harbor-client.fullname" . }}
-  labels:
-    {{- include "snappcloud-harbor-client.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -15,11 +13,6 @@ spec:
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      labels:
-        {{- include "snappcloud-harbor-client.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/clients/harbor-client/charts/templates/secret.yaml b/clients/harbor-client/charts/templates/secret.yaml
@@ -2,8 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.configSecretName }}
-  labels:
-    {{- include "snappcloud-harbor-client.labels" . | nindent 4 }}
 type: Opaque
 stringData:
   IMAGE_REFERENCE: "The image reference URL starts with //."
diff --git a/clients/harbor-client/charts/templates/service.yaml b/clients/harbor-client/charts/templates/service.yaml
@@ -2,8 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "snappcloud-harbor-client.fullname" . }}
-  labels:
-    {{- include "snappcloud-harbor-client.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/clients/proxy-client/charts/templates/_helpers.tpl b/clients/proxy-client/charts/templates/_helpers.tpl
@@ -30,19 +30,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{/*
-Common labels
-*/}}
-{{- define "snappcloud-proxy-client.labels" -}}
-helm.sh/chart: {{ include "snappcloud-proxy-client.chart" . }}
-{{ include "snappcloud-proxy-client.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
 Selector labels
 */}}
 {{- define "snappcloud-proxy-client.selectorLabels" -}}

diff --git a/clients/proxy-client/charts/templates/deployment.yaml b/clients/proxy-client/charts/templates/deployment.yaml
@@ -2,8 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "snappcloud-proxy-client.fullname" . }}
-  labels:
-    {{- include "snappcloud-proxy-client.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -15,11 +13,6 @@ spec:
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      labels:
-        {{- include "snappcloud-proxy-client.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/clients/proxy-client/charts/templates/secret.yaml b/clients/proxy-client/charts/templates/secret.yaml
@@ -2,8 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.configSecretName }}
-  labels:
-    {{- include "snappcloud-proxy-client.labels" . | nindent 4 }}
 type: Opaque
 stringData:
   PROXY_URL: "The proxy address."
diff --git a/clients/proxy-client/charts/templates/service.yaml b/clients/proxy-client/charts/templates/service.yaml
@@ -2,8 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "snappcloud-proxy-client.fullname" . }}
-  labels:
-    {{- include "snappcloud-proxy-client.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports: