Skip to content

Commit 962dbfe

Browse files
misc: deployment, reference and statefulset updated versions (#6284)
* feat: add deployment and reference 4-20-0, statefulset 5-1-0 * feat: add reference chart 5-0-0 --------- Co-authored-by: Pawan Mehta <[email protected]>
1 parent 2512e9e commit 962dbfe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+841
-135
lines changed

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ spec:
5656
matchLabels:
5757
{{- if .Values.customMatchLabels }}
5858
{{ toYaml .Values.customMatchLabels | indent 6 }}
59-
{{- else }}
59+
{{- else }}
6060
app: {{ template ".Chart.Name .name" $ }}
6161
release: {{ $.Release.Name }}
62-
{{- end }}
62+
{{- end }}
6363
replicas: {{ $.Values.replicaCount }}
6464
minReadySeconds: {{ $.Values.MinReadySeconds }}
6565
template:
@@ -71,20 +71,19 @@ spec:
7171
{{- end }}
7272
{{- end }}
7373
labels:
74+
app: {{ template ".Chart.Name .name" $ }}
7475
appId: {{ $.Values.app | quote }}
7576
envId: {{ $.Values.env | quote }}
76-
{{- if .Values.appLabels }}
77-
{{ toYaml .Values.appLabels | indent 8 }}
78-
{{- end }}
77+
release: {{ $.Release.Name }}
7978
{{- if .Values.customPodLabels }}
80-
{{ toYaml .Values.customPodLabels | indent 8 }}
81-
{{- else }}
82-
app: {{ template ".Chart.Name .name" $ }}
83-
release: {{ $.Release.Name }}
79+
{{ toYaml .Values.customPodLabels | indent 8 }}
80+
{{- end }}
81+
{{- if .Values.appLabels }}
82+
{{ toYaml .Values.appLabels | indent 8 }}
83+
{{- end }}
8484
{{- if .Values.podLabels }}
8585
{{ toYaml .Values.podLabels | indent 8 }}
8686
{{- end }}
87-
{{- end }}
8887
spec:
8988
{{- if $.Values.podExtraSpecs }}
9089
{{ toYaml .Values.podExtraSpecs | indent 6 }}
@@ -492,7 +491,7 @@ spec:
492491
{{- end }}
493492
{{- end }}
494493
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }}
495-
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
494+
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
496495
{{- if $.Values.appMetrics }}
497496
- name: envoy
498497
image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}}
@@ -666,9 +665,10 @@ spec:
666665
matchLabels:
667666
{{- if .Values.customMatchLabels }}
668667
{{ toYaml .Values.customMatchLabels | indent 6 }}
669-
{{- end }}
668+
{{- else }}
670669
app: {{ template ".Chart.Name .name" $ }}
671670
release: {{ $.Release.Name }}
671+
{{- end }}
672672
replicas: {{ $.Values.secondaryWorkload.replicaCount | default 1 }}
673673
minReadySeconds: {{ $.Values.MinReadySeconds }}
674674
template:
@@ -1102,7 +1102,7 @@ spec:
11021102
{{- end }}
11031103
{{- end }}
11041104
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }}
1105-
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
1105+
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
11061106
{{- if $.Values.appMetrics }}
11071107
- name: envoy
11081108
image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}}
@@ -1233,7 +1233,7 @@ spec:
12331233
{{- end }}
12341234
{{- end }}
12351235
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) (eq (.Values.appMetrics) false) }} []{{- end }}
1236-
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) (eq (.Values.appMetrics) false)}} [] {{- end }}
1236+
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) (eq (.Values.appMetrics) false) }} [] {{- end }}
12371237

12381238
revisionHistoryLimit: 3
12391239
## pauseForSecondsBeforeSwitchActive: {{ $.Values.pauseForSecondsBeforeSwitchActive }}
@@ -1248,4 +1248,5 @@ spec:
12481248
{{- if eq .Values.deploymentType "RECREATE" }}
12491249
type: "Recreate"
12501250
{{- end }}
1251-
{{- end }}
1251+
{{- end }}
1252+

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ apiVersion: autoscaling/v2beta1
88
{{- end }}
99
kind: HorizontalPodAutoscaler
1010
metadata:
11+
{{- if $.Values.autoscaling.name }}
12+
name: {{ $.Values.autoscaling.name }}
13+
{{- else }}
1114
name: {{ template ".Chart.Name .fullname" $ }}-hpa
15+
{{- end }}
1216
{{- if .Values.autoscaling.annotations }}
1317
annotations:
1418
{{ toYaml .Values.autoscaling.annotations | indent 4 }}
@@ -22,6 +26,9 @@ metadata:
2226
{{- if .Values.autoscaling.labels }}
2327
{{ toYaml .Values.autoscaling.labels | indent 4 }}
2428
{{- end }}
29+
{{- if $.Values.appLabels }}
30+
{{ toYaml $.Values.appLabels | indent 4 }}
31+
{{- end }}
2532
spec:
2633
scaleTargetRef:
2734
apiVersion: apps/v1

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-authorizationpolicy.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
apiVersion: security.istio.io/v1beta1
44
kind: AuthorizationPolicy
55
metadata:
6+
{{- if .authorizationPolicy.name }}
7+
name: {{ .authorizationPolicy.name }}
8+
{{- else }}
69
name: {{ template ".Chart.Name .fullname" $ }}
10+
{{- end }}
711
labels:
812
app: {{ template ".Chart.Name .name" $ }}
913
appId: {{ $.Values.app | quote }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-destinationrule.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
apiVersion: networking.istio.io/v1beta1
44
kind: DestinationRule
55
metadata:
6+
{{- if .destinationRule.name }}
7+
name: {{ .destinationRule.name }}
8+
{{- else }}
69
name: {{ template ".Chart.Name .fullname" $ }}-destinationrule
10+
{{- end }}
711
labels:
812
app: {{ template ".Chart.Name .name" $ }}
913
appId: {{ $.Values.app | quote }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-gateway.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
apiVersion: networking.istio.io/v1beta1
33
kind: Gateway
44
metadata:
5+
{{- if .Values.istio.gateway.name }}
6+
name: {{ .Values.istio.gateway.name }}
7+
{{- else }}
58
name: {{ template ".Chart.Name .fullname" $ }}-istio-gateway
9+
{{- end }}
610
labels:
711
app: {{ template ".Chart.Name .name" $ }}
812
appId: {{ $.Values.app | quote }}
@@ -28,7 +32,13 @@ spec:
2832
name: http
2933
protocol: HTTP
3034
hosts:
35+
{{- if .Values.istio.gateway.host }}
3136
- {{ .Values.istio.gateway.host | quote -}}
37+
{{- else if .Values.istio.gateway.hosts }}
38+
{{- range .Values.istio.gateway.hosts }}
39+
- {{ . | quote }}
40+
{{- end }}
41+
{{- end }}
3242
{{ with .Values.istio.gateway }}
3343
{{- if .tls.enabled }}
3444
tls:
@@ -38,7 +48,13 @@ spec:
3848
name: https
3949
protocol: HTTPS
4050
hosts:
51+
{{- if .host }}
4152
- {{ .host | quote }}
53+
{{- else if .hosts }}
54+
{{- range .hosts }}
55+
- {{ . | quote }}
56+
{{- end }}
57+
{{- end }}
4258
tls:
4359
mode: SIMPLE
4460
credentialName: {{ .tls.secretName }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-peerauthentication.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
apiVersion: security.istio.io/v1beta1
44
kind: PeerAuthentication
55
metadata:
6+
{{- if .peerAuthentication.name }}
7+
name: {{ .peerAuthentication.name }}
8+
{{- else }}
69
name: {{ template ".Chart.Name .fullname" $ }}
10+
{{- end }}
711
labels:
812
app: {{ template ".Chart.Name .name" $ }}
913
appId: {{ $.Values.app | quote }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-requestauthentication.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
apiVersion: security.istio.io/v1beta1
44
kind: RequestAuthentication
55
metadata:
6+
{{- if .requestAuthentication.name }}
7+
name: {{.requestAuthentication.name }}
8+
{{- else }}
69
name: {{ template ".Chart.Name .fullname" $ }}
10+
{{- end }}
711
labels:
812
app: {{ template ".Chart.Name .name" $ }}
913
appId: {{ $.Values.app | quote }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-virtualservice.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
apiVersion: networking.istio.io/v1beta1
44
kind: VirtualService
55
metadata:
6-
name: {{ template ".Chart.Name .fullname" $ }}-virtualservice
6+
{{- if .virtualService.name }}
7+
name: {{ .virtualService.name }}
8+
{{- else }}
9+
name: {{ template ".Chart.Name .fullname" $ }}-virtualservice
10+
{{- end }}
711
labels:
812
app: {{ template ".Chart.Name .name" $ }}
913
appId: {{ $.Values.app | quote }}
@@ -33,7 +37,13 @@ spec:
3337
{{- if or .gateway.enabled .virtualService.hosts }}
3438
hosts:
3539
{{- if .gateway.enabled }}
40+
{{- if .gateway.host }}
3641
- {{ .gateway.host | quote }}
42+
{{- else if .gateway.hosts }}
43+
{{- range .gateway.hosts }}
44+
- {{ . | quote }}
45+
{{- end }}
46+
{{- end }}
3747
{{- end }}
3848
{{- range .virtualService.hosts }}
3949
- {{ . | quote }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ metadata:
6969
release: {{ $.Release.Name }}
7070
appId: {{ $.Values.app | quote }}
7171
envId: {{ $.Values.env | quote }}
72-
72+
{{- if .Values.appLabels }}
73+
{{ toYaml .Values.appLabels | indent 4 }}
74+
{{- end }}
7375
spec:
7476
{{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }}
7577
{{- end }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/networkpolicy.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{{- if .Values.networkPolicy.enabled -}}
2-
{{- with .Values.networkPolicy }}
32
apiVersion: networking.k8s.io/v1
43
kind: NetworkPolicy
54
metadata:
5+
{{- if .Values.networkPolicy.name }}
6+
name: {{ .Values.networkPolicy.name }}
7+
{{- else }}
68
name: {{ template ".Chart.Name .fullname" $ }}-networkpolicy
9+
{{- end }}
710
labels:
811
app: {{ template ".Chart.Name .name" $ }}
912
appId: {{ $.Values.app | quote }}
@@ -46,5 +49,4 @@ spec:
4649
egress:
4750
{{ toYaml $.Values.networkPolicy.ingress | indent 4}}
4851
{{- end }}
49-
{{- end }}
5052
{{- end }}

0 commit comments

Comments
 (0)