added support of labels and annotations on hpa and labels of ingress (#1526)

* added support of labels and annotations on hpa and labels of ingress

* modified the hpa and ingress yaml in chart

* support of annotation and labels on hpa and ingress into all charts

Co-authored-by: 123ajay0 <[email protected]>

Author: ajaydevtron

scripts/devtron-reference-helm-charts/reference-chart_3-0-0/app-values.yaml

@@ -29,6 +29,7 @@ args:
 
 ingress:
   enabled: false
+  labels: {}
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'

scripts/devtron-reference-helm-charts/reference-chart_3-0-0/templates/hpa.yaml

@@ -4,6 +4,14 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
  name: {{ template ".Chart.Name .fullname" $ }}-hpa
+ {{- if .Values.autoscaling.annotations }}
+ annotations:
+{{ toYaml .Values.autoscaling.annotations | indent 4 }}
+  {{- end }}
+  {{- if .Values.autoscaling.labels }}
+ labels:
+{{ toYaml .Values.autoscaling.labels | indent 4 }}
+  {{- end }}
 spec:
  scaleTargetRef:
    apiVersion: argoproj.io/v1alpha1

scripts/devtron-reference-helm-charts/reference-chart_3-0-0/templates/ingress.yaml

@@ -9,6 +9,9 @@ metadata:
     app: {{ template ".Chart.Name .name" . }}
     chart: {{ template ".Chart.Name .chart" . }}
     release: {{ .Release.Name }}
+    {{- if .Values.ingress.labels }}
+{{ toYaml .Values.ingress.labels | indent 4 }}
+    {{- end }}
 {{- if .Values.ingress.annotations }}
   annotations:
 {{ toYaml .Values.ingress.annotations | indent 4 }}

scripts/devtron-reference-helm-charts/reference-chart_3-0-0/values.yaml

@@ -31,6 +31,8 @@ autoscaling:
   MaxReplicas: 2
   TargetCPUUtilizationPercentage: 90
   TargetMemoryUtilizationPercentage: 80
+  annotations: {}
+  labels: {}
 
 secret:
   enabled: false
@@ -76,6 +78,7 @@ servicemonitor:
 ingress:
   enabled: false
   annotations: {}
+  labels: {}
 #    nginx.ingress.kubernetes.io/rewrite-target: /
 #    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 #    kubernetes.io/ingress.class: nginx

scripts/devtron-reference-helm-charts/reference-chart_3-1-0/app-values.yaml

@@ -29,6 +29,7 @@ args:
 
 ingress:
   enabled: false
+  labels: {}
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'

scripts/devtron-reference-helm-charts/reference-chart_3-1-0/templates/hpa.yaml

@@ -4,6 +4,14 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
  name: {{ template ".Chart.Name .fullname" $ }}-hpa
+ {{- if .Values.autoscaling.annotations }}
+ annotations:
+{{ toYaml .Values.autoscaling.annotations | indent 4 }}
+  {{- end }}
+  {{- if .Values.autoscaling.labels }}
+ labels:
+{{ toYaml .Values.autoscaling.labels | indent 4 }}
+  {{- end }}
 spec:
  scaleTargetRef:
    apiVersion: argoproj.io/v1alpha1

scripts/devtron-reference-helm-charts/reference-chart_3-1-0/templates/ingress.yaml

@@ -11,6 +11,9 @@ metadata:
     envId: {{ $.Values.env | quote }}
     chart: {{ template ".Chart.Name .chart" . }}
     release: {{ .Release.Name }}
+    {{- if .Values.ingress.labels }}
+{{ toYaml .Values.ingress.labels | indent 4 }}
+    {{- end }}
 {{- if .Values.ingress.annotations }}
   annotations:
 {{ toYaml .Values.ingress.annotations | indent 4 }}

scripts/devtron-reference-helm-charts/reference-chart_3-1-0/values.yaml

@@ -31,6 +31,8 @@ autoscaling:
   MaxReplicas: 2
   TargetCPUUtilizationPercentage: 90
   TargetMemoryUtilizationPercentage: 80
+  annotations: {}
+  labels: {}
 
 secret:
   enabled: false
@@ -76,6 +78,7 @@ servicemonitor:
 ingress:
   enabled: false
   annotations: {}
+  labels: {}
 #    nginx.ingress.kubernetes.io/rewrite-target: /
 #    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 #    kubernetes.io/ingress.class: nginx

scripts/devtron-reference-helm-charts/reference-chart_3-10-0/app-values.yaml

@@ -79,6 +79,7 @@ ReadinessProbe:
 
 ingress:
   enabled: false
+  labels: {}
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'
@@ -173,6 +174,8 @@ autoscaling:
   MaxReplicas: 2
   TargetCPUUtilizationPercentage: 70
   TargetMemoryUtilizationPercentage: 80
+  annotations: {}
+  labels: {}
   extraMetrics: []
 #    - external:
 #        metricName: pubsub.googleapis.com|subscription|num_undelivered_messages

scripts/devtron-reference-helm-charts/reference-chart_3-10-0/templates/hpa.yaml

@@ -4,6 +4,14 @@ apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template ".Chart.Name .fullname" $ }}-hpa
+  {{- if .Values.autoscaling.annotations }}
+  annotations:
+{{ toYaml .Values.autoscaling.annotations | indent 4 }}
+  {{- end }}
+  {{- if .Values.autoscaling.labels }}
+  labels:
+{{ toYaml .Values.autoscaling.labels | indent 4 }}
+  {{- end }}
 spec:
   scaleTargetRef:
     apiVersion: argoproj.io/v1alpha1