Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 16, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a603d55
added support of labels and annotations on hpa and labels of ingress
Apr 21, 2022
89e046d
modified the hpa and ingress yaml in chart
Apr 22, 2022
f2e3cb9
Merge branch 'main' into support-label-ingress-anontation-hpa
Apr 29, 2022
271c3e6
support of annotation and labels on hpa and ingress into all charts
Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-0-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-0-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-0-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-0-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}

secret:
enabled: false
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-1-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-1-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-1-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-1-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}

secret:
enabled: false
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-10-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -173,6 +174,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 70
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}
extraMetrics: []
# - external:
# metricName: pubsub.googleapis.com|subscription|num_undelivered_messages
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-10-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-10-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-10-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}
extraMetrics: []
# - external:
# metricName: pubsub.googleapis.com|subscription|num_undelivered_messages
Expand Down Expand Up @@ -135,6 +137,7 @@ prometheusRule:

ingress:
enabled: false
labels: {}
annotations: {}
# nginx.ingress.kubernetes.io/rewrite-target: /
# nginx.ingress.kubernetes.io/ssl-redirect: "false"
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-11-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ ReadinessProbe:

ingress:
enabled: false
labels: {}
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'
nginx.ingress.kubernetes.io/ssl-redirect: 'false'
Expand Down Expand Up @@ -186,6 +187,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 70
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}
extraMetrics: []
# - external:
# metricName: pubsub.googleapis.com|subscription|num_undelivered_messages
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-11-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-11-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-11-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}
extraMetrics: []
# - external:
# metricName: pubsub.googleapis.com|subscription|num_undelivered_messages
Expand Down Expand Up @@ -134,6 +136,7 @@ prometheusRule:

ingress:
enabled: false
labels: {}
annotations: {}
# nginx.ingress.kubernetes.io/rewrite-target: /
# nginx.ingress.kubernetes.io/ssl-redirect: "false"
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-12-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ ReadinessProbe:

ingress:
enabled: false
labels: {}
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'
nginx.ingress.kubernetes.io/ssl-redirect: 'false'
Expand Down Expand Up @@ -186,6 +187,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 70
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}
extraMetrics: []
# - external:
# metricName: pubsub.googleapis.com|subscription|num_undelivered_messages
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-12-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-12-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-12-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}
extraMetrics: []
# - external:
# metricName: pubsub.googleapis.com|subscription|num_undelivered_messages
Expand Down Expand Up @@ -138,6 +140,7 @@ prometheusRule:

ingress:
enabled: false
labels: {}
annotations: {}
# nginx.ingress.kubernetes.io/rewrite-target: /
# nginx.ingress.kubernetes.io/ssl-redirect: "false"
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-3-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ContainerPort:

ingress:
enabled: false
labels: {}
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /$2
nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'
Expand Down Expand Up @@ -92,6 +93,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}

server:
deployment:
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-3-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-3-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-3-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}

secret:
enabled: false
Expand Down Expand Up @@ -80,6 +82,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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-4-0/app-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ContainerPort:

ingress:
enabled: false
labels: {}
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /$2
nginx.ingress.kubernetes.io/force-ssl-redirect: 'false'
Expand Down Expand Up @@ -104,6 +105,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}

server:
deployment:
Expand Down
8 changes: 8 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-4-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-4-0/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_3-4-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ autoscaling:
MaxReplicas: 2
TargetCPUUtilizationPercentage: 90
TargetMemoryUtilizationPercentage: 80
annotations: {}
labels: {}

secret:
enabled: false
Expand Down Expand Up @@ -79,6 +81,7 @@ servicemonitor:

ingress:
enabled: false
labels: {}
annotations: {}
# nginx.ingress.kubernetes.io/rewrite-target: /
# nginx.ingress.kubernetes.io/ssl-redirect: "false"
Expand Down
Loading