Skip to content

misc: deployment, reference and statefulset updated versions #6284

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
Jan 23, 2025
Merged

misc: deployment, reference and statefulset updated versions #6284

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
cd7cb5d
feat: add deployment and reference 4-20-0, statefulset 5-1-0
SATYAsasini Jan 14, 2025
6033027
feat: add reference chart 5-0-0
SATYAsasini Jan 14, 2025
8facf4f
Merge branch 'main' into feat/chart-versions
pawan-mehta-dt Jan 22, 2025
9fa44a0
Merge branch 'main' into feat/chart-versions
pawan-mehta-dt Jan 23, 2025
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
31 changes: 16 additions & 15 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- else }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
{{- end }}
replicas: {{ $.Values.replicaCount }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand All @@ -71,20 +71,19 @@ spec:
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
release: {{ $.Release.Name }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- end }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
{{ toYaml .Values.podExtraSpecs | indent 6 }}
Expand Down Expand Up @@ -492,7 +491,7 @@ spec:
{{- end }}
{{- end }}
{{- 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 }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if $.Values.appMetrics }}
- name: envoy
image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}}
Expand Down Expand Up @@ -666,9 +665,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- end }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
replicas: {{ $.Values.secondaryWorkload.replicaCount | default 1 }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand Down Expand Up @@ -1102,7 +1102,7 @@ spec:
{{- end }}
{{- end }}
{{- 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 }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if $.Values.appMetrics }}
- name: envoy
image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}}
Expand Down Expand Up @@ -1233,7 +1233,7 @@ spec:
{{- end }}
{{- end }}
{{- 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 }}
{{- 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 }}
{{- 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 }}

revisionHistoryLimit: 3
## pauseForSecondsBeforeSwitchActive: {{ $.Values.pauseForSecondsBeforeSwitchActive }}
Expand All @@ -1248,4 +1248,5 @@ spec:
{{- if eq .Values.deploymentType "RECREATE" }}
type: "Recreate"
{{- end }}
{{- end }}
{{- end }}

7 changes: 7 additions & 0 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ apiVersion: autoscaling/v2beta1
{{- end }}
kind: HorizontalPodAutoscaler
metadata:
{{- if $.Values.autoscaling.name }}
name: {{ $.Values.autoscaling.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-hpa
{{- end }}
{{- if .Values.autoscaling.annotations }}
annotations:
{{ toYaml .Values.autoscaling.annotations | indent 4 }}
Expand All @@ -22,6 +26,9 @@ metadata:
{{- if .Values.autoscaling.labels }}
{{ toYaml .Values.autoscaling.labels | indent 4 }}
{{- end }}
{{- if $.Values.appLabels }}
{{ toYaml $.Values.appLabels | indent 4 }}
{{- end }}
spec:
scaleTargetRef:
apiVersion: apps/v1
Expand Down
4 changes: 4 additions & 0 deletions ...on-reference-helm-charts/deployment-chart_4-20-0/templates/istio-authorizationpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: security.istio.io/v1beta1
kind: AuthorizationPolicy
metadata:
{{- if .authorizationPolicy.name }}
name: {{ .authorizationPolicy.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down
4 changes: 4 additions & 0 deletions ...evtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-destinationrule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: networking.istio.io/v1beta1
kind: DestinationRule
metadata:
{{- if .destinationRule.name }}
name: {{ .destinationRule.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-destinationrule
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down
16 changes: 16 additions & 0 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
apiVersion: networking.istio.io/v1beta1
kind: Gateway
metadata:
{{- if .Values.istio.gateway.name }}
name: {{ .Values.istio.gateway.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-istio-gateway
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand All @@ -28,7 +32,13 @@ spec:
name: http
protocol: HTTP
hosts:
{{- if .Values.istio.gateway.host }}
- {{ .Values.istio.gateway.host | quote -}}
{{- else if .Values.istio.gateway.hosts }}
{{- range .Values.istio.gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{ with .Values.istio.gateway }}
{{- if .tls.enabled }}
tls:
Expand All @@ -38,7 +48,13 @@ spec:
name: https
protocol: HTTPS
hosts:
{{- if .host }}
- {{ .host | quote }}
{{- else if .hosts }}
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
tls:
mode: SIMPLE
credentialName: {{ .tls.secretName }}
Expand Down
4 changes: 4 additions & 0 deletions ...ron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-peerauthentication.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: security.istio.io/v1beta1
kind: PeerAuthentication
metadata:
{{- if .peerAuthentication.name }}
name: {{ .peerAuthentication.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down
4 changes: 4 additions & 0 deletions ...-reference-helm-charts/deployment-chart_4-20-0/templates/istio-requestauthentication.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: security.istio.io/v1beta1
kind: RequestAuthentication
metadata:
{{- if .requestAuthentication.name }}
name: {{.requestAuthentication.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down
12 changes: 11 additions & 1 deletion ...devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-virtualservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: networking.istio.io/v1beta1
kind: VirtualService
metadata:
name: {{ template ".Chart.Name .fullname" $ }}-virtualservice
{{- if .virtualService.name }}
name: {{ .virtualService.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-virtualservice
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down Expand Up @@ -33,7 +37,13 @@ spec:
{{- if or .gateway.enabled .virtualService.hosts }}
hosts:
{{- if .gateway.enabled }}
{{- if .gateway.host }}
- {{ .gateway.host | quote }}
{{- else if .gateway.hosts }}
{{- range .gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- range .virtualService.hosts }}
- {{ . | quote }}
Expand Down
4 changes: 3 additions & 1 deletion ...pts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ metadata:
release: {{ $.Release.Name }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}

{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }}
{{- end }}
Expand Down
6 changes: 4 additions & 2 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{{- if .Values.networkPolicy.enabled -}}
{{- with .Values.networkPolicy }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
{{- if .Values.networkPolicy.name }}
name: {{ .Values.networkPolicy.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-networkpolicy
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down Expand Up @@ -46,5 +49,4 @@ spec:
egress:
{{ toYaml $.Values.networkPolicy.ingress | indent 4}}
{{- end }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions ...tron-reference-helm-charts/deployment-chart_4-20-0/templates/vertical-pod-autoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: autoscaling.k8s.io/v1
kind: VerticalPodAutoscaler
metadata:
{{- if .Values.verticalPodScaling.name }}
name: {{ .Values.verticalPodScaling.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" . }}-vpa
{{- end }}
labels:
kind: Prometheus
app: {{ template ".Chart.Name .name" . }}
Expand Down
15 changes: 9 additions & 6 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,20 @@ service:
# test3: test4

istio:
enable: false
enable: true
gateway:
enabled: false
enabled: true
labels: {}
annotations: {}
host: example.com
# host: example.com
hosts:
- kamal
- "example4.com"
tls:
enabled: false
enabled: true
secretName: example-tls-secret
virtualService:
enabled: false
enabled: true
labels: {}
annotations: {}
gateways: []
Expand Down Expand Up @@ -766,7 +769,7 @@ affinity:
topologyKey: topology.kubernetes.io/zone

secondaryWorkload:
enabled: true
enabled: false
postfix: "od"
replicaCount: 1
affinity: {}
Expand Down
2 changes: 0 additions & 2 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,8 +558,6 @@ ConfigMaps:
ConfigSecrets:
enabled: false
secrets: []
enabled: false
secrets: []
# data:
# key1: key1value-1
# key2: key2value-1
Expand Down
21 changes: 10 additions & 11 deletions scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- else }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
{{- end }}
replicas: {{ $.Values.replicaCount }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand All @@ -70,20 +70,19 @@ spec:
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
release: {{ $.Release.Name }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- end }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
{{ toYaml .Values.podExtraSpecs | indent 6 }}
Expand Down Expand Up @@ -622,4 +621,4 @@ spec:
maxUnavailable: {{ $.Values.deployment.strategy.canary.maxUnavailable }}
steps:
{{ toYaml .Values.deployment.strategy.canary.steps | indent 8 }}
{{- end }}
{{- end }}
7 changes: 7 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ apiVersion: autoscaling/v2beta1
{{- end }}
kind: HorizontalPodAutoscaler
metadata:
{{- if $.Values.autoscaling.name }}
name: {{ $.Values.autoscaling.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-hpa
{{- end }}
{{- if .Values.autoscaling.annotations }}
annotations:
{{ toYaml .Values.autoscaling.annotations | indent 4 }}
Expand All @@ -22,6 +26,9 @@ metadata:
{{- if .Values.autoscaling.labels }}
{{ toYaml .Values.autoscaling.labels | indent 4 }}
{{- end }}
{{- if $.Values.appLabels }}
{{ toYaml $.Values.appLabels | indent 4 }}
{{- end }}
spec:
scaleTargetRef:
apiVersion: argoproj.io/v1alpha1
Expand Down
4 changes: 4 additions & 0 deletions ...ron-reference-helm-charts/reference-chart_4-20-0/templates/istio-authorizationpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
apiVersion: security.istio.io/v1beta1
kind: AuthorizationPolicy
metadata:
{{- if .authorizationPolicy.name }}
name: {{ .authorizationPolicy.name }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down
Loading
Loading