Add option for additional chart labels in values (#3676)

* Add option for additional chart labels in values * fix lint * update helpers.tpl * remove uneccessary tpl function * update values name to chartLabels and remove unused chart labels * Update values.yaml comments * use - before include to chomped left for whitespaces --------- Co-authored-by: Thomas Nguyen <[email protected]> Co-authored-by: Chip Zoller <[email protected]>
kubecost · Oct 2, 2024 · 1a0f9f5 · 1a0f9f5
1 parent 8bed9b7
commit 1a0f9f5
Show file tree

Hide file tree

Showing 65 changed files with 86 additions and 87 deletions.
diff --git a/cost-analyzer/templates/_helpers.tpl b/cost-analyzer/templates/_helpers.tpl
@@ -467,18 +467,9 @@ Create the chart labels.
 {{- define "cost-analyzer.chartLabels" -}}
 helm.sh/chart: {{ include "cost-analyzer.chart" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-{{- define "kubecost.chartLabels" -}}
-app.kubernetes.io/name: {{ include "cost-analyzer.name" . }}
-helm.sh/chart: {{ include "cost-analyzer.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-{{- define "kubecost.aggregator.chartLabels" -}}
-app.kubernetes.io/name: {{ include "aggregator.name" . }}
-helm.sh/chart: {{ include "cost-analyzer.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.chartLabels }}
+{{ toYaml .Values.chartLabels }}
+{{- end }}
 {{- end -}}
 
 

diff --git a/cost-analyzer/templates/aggregator-cloud-cost-deployment.yaml b/cost-analyzer/templates/aggregator-cloud-cost-deployment.yaml
@@ -15,15 +15,15 @@ metadata:
   name: {{ template "cloudCost.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cloudCost.commonLabels" . | nindent 4 }}
+    {{- include "cloudCost.commonLabels" . | nindent 4 }}
     {{- with .Values.global.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      {{ include "cloudCost.selectorLabels" . | nindent 6 }}
+      {{- include "cloudCost.selectorLabels" . | nindent 6 }}
   strategy:
     type: Recreate
   template:

diff --git a/cost-analyzer/templates/aggregator-cloud-cost-service-account.yaml b/cost-analyzer/templates/aggregator-cloud-cost-service-account.yaml
@@ -13,7 +13,7 @@ metadata:
   name: {{ template "cloudCost.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cloudCost.commonLabels" . | nindent 4 }}
+    {{- include "cloudCost.commonLabels" . | nindent 4 }}
 {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/cost-analyzer/templates/aggregator-cloud-cost-service.yaml b/cost-analyzer/templates/aggregator-cloud-cost-service.yaml
@@ -5,10 +5,10 @@ metadata:
   name: {{ template "cloudCost.serviceName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "cloudCost.commonLabels" . | nindent 4 }}
+    {{- include "cloudCost.commonLabels" . | nindent 4 }}
 spec:
   selector:
-{{ include "cloudCost.selectorLabels" . | nindent 4 }}
+    {{- include "cloudCost.selectorLabels" . | nindent 4 }}
   type: "ClusterIP"
   ports:
     - name: tcp-api

diff --git a/cost-analyzer/templates/aggregator-service.yaml b/cost-analyzer/templates/aggregator-service.yaml
@@ -5,13 +5,13 @@ metadata:
   name: {{ template "aggregator.serviceName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "aggregator.commonLabels" . | nindent 4 }}
-{{- if .Values.kubecostAggregator.service.labels }}
+    {{- include "aggregator.commonLabels" . | nindent 4 }}
+    {{- if .Values.kubecostAggregator.service.labels }}
     {{- toYaml .Values.kubecostAggregator.service.labels | nindent 4 }}
-{{- end }}
+    {{- end }}
 spec:
   selector:
-{{ include "aggregator.selectorLabels" . | nindent 4 }}
+    {{- include "aggregator.selectorLabels" . | nindent 4 }}
   type: "ClusterIP"
   ports:
     - name: tcp-api

diff --git a/cost-analyzer/templates/aggregator-servicemonitor.yaml b/cost-analyzer/templates/aggregator-servicemonitor.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "aggregator.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "aggregator.commonLabels" . | nindent 4 }}
+    {{- include "aggregator.commonLabels" . | nindent 4 }}
     {{- if .Values.serviceMonitor.aggregatorMetrics.additionalLabels }}
     {{ toYaml .Values.serviceMonitor.aggregatorMetrics.additionalLabels | nindent 4 }}
     {{- end }}

diff --git a/cost-analyzer/templates/alibaba-service-key-secret.yaml b/cost-analyzer/templates/alibaba-service-key-secret.yaml
@@ -7,7 +7,7 @@ metadata:
   name: cloud-service-key
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 type: Opaque
 stringData:
   service-key.json: |-

diff --git a/cost-analyzer/templates/aws-service-key-secret.yaml b/cost-analyzer/templates/aws-service-key-secret.yaml
@@ -7,7 +7,7 @@ metadata:
   name: cloud-service-key
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 type: Opaque
 stringData:
   service-key.json: |-

diff --git a/cost-analyzer/templates/awsstore-service-account-template.yaml b/cost-analyzer/templates/awsstore-service-account-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: awsstore-serviceaccount
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 {{- with .Values.awsstore.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/cost-analyzer/templates/azure-service-key-secret.yaml b/cost-analyzer/templates/azure-service-key-secret.yaml
@@ -7,7 +7,7 @@ metadata:
   name: cloud-service-key
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 type: Opaque
 stringData:
   service-key.json: |-

diff --git a/cost-analyzer/templates/azure-storage-config-secret.yaml b/cost-analyzer/templates/azure-storage-config-secret.yaml
@@ -10,7 +10,7 @@ metadata:
   name: azure-storage-config
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 type: Opaque
 stringData:
   azure-storage-config.json: |-

diff --git a/cost-analyzer/templates/cost-analyzer-account-mapping-configmap.yaml b/cost-analyzer/templates/cost-analyzer-account-mapping-configmap.yaml
@@ -5,7 +5,8 @@ kind: ConfigMap
 metadata:
   name: "account-mapping"
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+  labels:
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   account-map.json: '{{ toJson .Values.kubecostProductConfigs.cloudAccountMapping }}'
 {{- end }}

diff --git a/cost-analyzer/templates/cost-analyzer-alerts-configmap.yaml b/cost-analyzer/templates/cost-analyzer-alerts-configmap.yaml
@@ -4,7 +4,8 @@ kind: ConfigMap
 metadata:
   name: {{ default "alert-configs" .Values.alertConfigmapName }}
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+  labels:
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   alerts.json: '{{ toJson .Values.global.notifications.alertConfigs }}'
 {{- end -}}
diff --git a/cost-analyzer/templates/cost-analyzer-asset-reports-configmap.yaml b/cost-analyzer/templates/cost-analyzer-asset-reports-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ default "asset-report-configs" .Values.assetReportConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   asset-reports.json: '{{ toJson .Values.global.assetReports.reports }}'
 {{- end -}}

diff --git a/cost-analyzer/templates/cost-analyzer-cloud-cost-reports-configmap.yaml b/cost-analyzer/templates/cost-analyzer-cloud-cost-reports-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{default "cloud-cost-report-configs" .Values.cloudCostReportConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   cloud-cost-reports.json: '{{ toJson .Values.global.cloudCostReports.reports }}'
 {{- end -}}

diff --git a/cost-analyzer/templates/cost-analyzer-cluster-role-binding-template.yaml b/cost-analyzer/templates/cost-analyzer-cluster-role-binding-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ template "cost-analyzer.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -24,7 +24,7 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "cost-analyzer.serviceAccountName" . }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml b/cost-analyzer/templates/cost-analyzer-cluster-role-template.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   name: {{ template "cost-analyzer.serviceAccountName" . }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 rules:
 - apiGroups: 
     - ''
@@ -32,7 +32,7 @@ kind: ClusterRole
 metadata:
   name: {{ template "cost-analyzer.serviceAccountName" . }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ''

diff --git a/cost-analyzer/templates/cost-analyzer-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-config-map-template.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "cost-analyzer.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   {{- if .Values.global.prometheus.enabled }}
   {{- if .Values.global.zone }}

diff --git a/cost-analyzer/templates/cost-analyzer-db-pvc-template.yaml b/cost-analyzer/templates/cost-analyzer-db-pvc-template.yaml
@@ -8,7 +8,7 @@ metadata:
   name: {{ template "cost-analyzer.fullname" . }}-db
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
     {{- with .Values.persistentVolume.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}

diff --git a/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-frontend-config-map-template.yaml
@@ -12,7 +12,7 @@ metadata:
   name: nginx-conf
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   nginx.conf: |
     gzip_static  on;

diff --git a/cost-analyzer/templates/cost-analyzer-ingestion-configmap.yaml b/cost-analyzer/templates/cost-analyzer-ingestion-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ default "ingestion-configs" .Values.ingestionConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   standardDiscount: "{{ .Values.kubecostProductConfigs.standardDiscount }}"
   helmConfig: "true"

diff --git a/cost-analyzer/templates/cost-analyzer-metrics-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-metrics-config-map-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ default "metrics-config" .Values.metricsConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   metrics.json: '{{ toJson .Values.kubecostProductConfigs.metricsConfigs }}'
 {{- end -}}

diff --git a/cost-analyzer/templates/cost-analyzer-network-costs-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-network-costs-config-map-template.yaml
@@ -7,7 +7,7 @@ metadata:
   name: network-costs-config
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   config.yaml: |
 {{- toYaml .Values.networkCosts.config | nindent 4 }}

diff --git a/cost-analyzer/templates/cost-analyzer-oidc-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-oidc-config-map-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ template "cost-analyzer.fullname" . }}-oidc
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
 {{- $root := . }}
     oidc.json: |-

diff --git a/cost-analyzer/templates/cost-analyzer-pkey-configmap.yaml b/cost-analyzer/templates/cost-analyzer-pkey-configmap.yaml
@@ -11,7 +11,7 @@ metadata:
   name: {{ default "product-configs" .Values.productConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   {{- if .Values.kubecostProductConfigs.productKey.key }}
     key: {{  .Values.kubecostProductConfigs.productKey.key | quote }}

diff --git a/cost-analyzer/templates/cost-analyzer-pricing-configmap.yaml b/cost-analyzer/templates/cost-analyzer-pricing-configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ default "pricing-configs" .Values.pricingConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   {{- if .Values.kubecostProductConfigs.defaultModelPricing }}
   {{- if .Values.kubecostProductConfigs.defaultModelPricing.enabled }}

diff --git a/cost-analyzer/templates/cost-analyzer-prometheusrule-template.yaml b/cost-analyzer/templates/cost-analyzer-prometheusrule-template.yaml
@@ -9,7 +9,7 @@ metadata:
   name: {{ include "cost-analyzer.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
     {{- if .Values.prometheusRule.additionalLabels }}
     {{ toYaml .Values.prometheusRule.additionalLabels | nindent 4 }}
     {{- end }}

diff --git a/cost-analyzer/templates/cost-analyzer-pvc-template.yaml b/cost-analyzer/templates/cost-analyzer-pvc-template.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ template "cost-analyzer.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
     {{- with .Values.persistentVolume.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}

diff --git a/cost-analyzer/templates/cost-analyzer-saml-config-map-template.yaml b/cost-analyzer/templates/cost-analyzer-saml-config-map-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ template "cost-analyzer.fullname" . }}-saml
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
 {{- $root := . }}
     saml.json: '{{ toJson .Values.saml }}'

diff --git a/cost-analyzer/templates/cost-analyzer-saved-reports-configmap.yaml b/cost-analyzer/templates/cost-analyzer-saved-reports-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{default "saved-report-configs" .Values.savedReportConfigmapName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   saved-reports.json: '{{ toJson .Values.global.savedReports.reports }}'
 {{- end -}}

diff --git a/cost-analyzer/templates/cost-analyzer-server-configmap.yaml b/cost-analyzer/templates/cost-analyzer-server-configmap.yaml
@@ -5,7 +5,8 @@ kind: ConfigMap
 metadata:
   name: {{ default "app-configs" .Values.appConfigmapName }}
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+  labels:
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
 {{- if .Values.kubecostProductConfigs.labelMappingConfigs }}
 {{- if .Values.kubecostProductConfigs.labelMappingConfigs.enabled }}

diff --git a/cost-analyzer/templates/cost-analyzer-service-account-template.yaml b/cost-analyzer/templates/cost-analyzer-service-account-template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "cost-analyzer.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/cost-analyzer/templates/cost-analyzer-servicemonitor-template.yaml b/cost-analyzer/templates/cost-analyzer-servicemonitor-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ include "cost-analyzer.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
     {{- if .Values.serviceMonitor.additionalLabels }}
     {{ toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
     {{- end }}
@@ -29,6 +29,6 @@ spec:
       - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      {{ include "cost-analyzer.selectorLabels" . | nindent 6 }}
+      {{- include "cost-analyzer.selectorLabels" . | nindent 6 }}
 {{- end }}
 {{- end }}
diff --git a/cost-analyzer/templates/etl-utils-service.yaml b/cost-analyzer/templates/etl-utils-service.yaml
@@ -6,10 +6,10 @@ metadata:
   name: {{ template "etlUtils.serviceName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "etlUtils.commonLabels" . | nindent 4 }}
+    {{- include "etlUtils.commonLabels" . | nindent 4 }}
 spec:
   selector:
-{{ include "etlUtils.selectorLabels" . | nindent 4 }}
+    {{- include "etlUtils.selectorLabels" . | nindent 4 }}
   type: "ClusterIP"
   ports:
     - name: api

diff --git a/cost-analyzer/templates/external-grafana-config-map-template.yaml b/cost-analyzer/templates/external-grafana-config-map-template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: external-grafana-config-map
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
 data:
   grafanaURL: {{ .Values.global.grafana.scheme | default "http" }}://{{- .Values.global.grafana.domainName }}
 {{- end -}}
diff --git a/cost-analyzer/templates/grafana-dashboard-attached-disks.yaml b/cost-analyzer/templates/grafana-dashboard-attached-disks.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: {{ $.Values.grafana.namespace_dashboards }}
   {{- end }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
     {{- if $.Values.grafana.sidecar.dashboards.label }}
     {{ $.Values.grafana.sidecar.dashboards.label }}: "{{ $.Values.grafana.sidecar.dashboards.labelValue }}"
     {{- else }}