Skip to content

feat: added support for secondary-wl v2 #6819

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: added support for secondary-wl v2 #6819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e60d8
added support for secondary-wl v2
badal773 Sep 9, 2025
6d49524
added test values.yaml
badal773 Sep 9, 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
28 changes: 22 additions & 6 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 @@ -202,7 +202,7 @@ spec:
{{- end}}
{{- end}}
containers:
- name: {{ $.Chart.Name }}
- name: {{ $.Values.containerName | default $.Chart.Name }}
image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
imagePullPolicy: {{ $.Values.image.pullPolicy }}
{{- if $.Values.containerSpec.lifecycle.enabled }}
Expand Down Expand Up @@ -642,7 +642,7 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include ".Chart.Name .fullname" $ }}-{{ $.Values.secondaryWorkload.postfix | default "sec" }}
name: {{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}
labels:
app: {{ template ".Chart.Name .name" $ }}
chart: {{ template ".Chart.Name .chart" $ }}
Expand All @@ -655,15 +655,25 @@ metadata:
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
{{- if .Values.secondaryWorkload.deploymentLabels }}
{{ toYaml .Values.secondaryWorkload.deploymentLabels | indent 4 }}
{{- end }}

{{- if .Values.deploymentAnnotations }}
{{- if or .Values.deploymentAnnotations .Values.secondaryWorkload.deploymentAnnotations }}
annotations:
{{- if .Values.deploymentAnnotations }}
{{ toYaml .Values.deploymentAnnotations | indent 4 }}
{{- end }}
{{- if .Values.secondaryWorkload.deploymentAnnotations }}
{{ toYaml .Values.secondaryWorkload.deploymentAnnotations | indent 4 }}
{{- end }}
{{- end }}
spec:
selector:
matchLabels:
{{- if .Values.customMatchLabels }}
{{- if .Values.secondaryWorkload.customMatchLabels }}
{{ toYaml .Values.secondaryWorkload.customMatchLabels | indent 6 }}
{{- else if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
Expand All @@ -673,11 +683,14 @@ spec:
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
metadata:
{{- if .Values.podAnnotations }}
{{- if or .Values.podAnnotations .Values.secondaryWorkload.podAnnotations }}
annotations:
{{- range $key, $value := .Values.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.secondaryWorkload.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
Expand All @@ -692,6 +705,9 @@ spec:
{{- end }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- if .Values.secondaryWorkload.podLabels }}
{{ toYaml .Values.secondaryWorkload.podLabels | indent 8 }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
Expand Down Expand Up @@ -813,7 +829,7 @@ spec:
{{- end}}
{{- end}}
containers:
- name: {{ $.Chart.Name }}
- name: {{ $.Values.secondaryWorkload.containerName | default $.Chart.Name }}
image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
imagePullPolicy: {{ $.Values.image.pullPolicy }}
{{- if $.Values.containerSpec.lifecycle.enabled }}
Expand Down
39 changes: 39 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 @@ -35,4 +35,43 @@ spec:
{{ toYaml $.Values.istio.destinationRule.trafficPolicy | indent 4 }}
{{- end }}
{{- end }}
{{- end }}
---
{{- with .Values.istio }}
{{- if and .enable .destinationRule.enabled $.Values.secondaryWorkload.istio.destinationRule.enabled }}
apiVersion: networking.istio.io/v1beta1
kind: DestinationRule
metadata:
{{- if $.Values.secondaryWorkload.istio.destinationRule.name }}
name: {{ $.Values.secondaryWorkload.istio.destinationRule.name }}
{{- else }}
name: {{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}-destinationrule
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" $ }}
release: {{ $.Release.Name }}
{{- if $.Values.appLabels }}
{{ toYaml $.Values.appLabels | indent 4 }}
{{- end }}
{{- if $.Values.secondaryWorkload.istio.destinationRule.labels }}
{{ toYaml $.Values.secondaryWorkload.istio.destinationRule.labels | indent 4 }}
{{- end }}
{{- if $.Values.secondaryWorkload.istio.destinationRule.annotations }}
annotations:
{{ toYaml $.Values.secondaryWorkload.istio.destinationRule.annotations | indent 4 }}
{{- end }}
spec:
host: "{{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}-service.{{ $.Release.Namespace }}.svc.cluster.local"
{{- if $.Values.secondaryWorkload.istio.destinationRule.subsets }}
subsets:
{{ toYaml $.Values.secondaryWorkload.istio.destinationRule.subsets | indent 4 }}
{{- end }}
{{- if $.Values.secondaryWorkload.istio.destinationRule.trafficPolicy }}
trafficPolicy:
{{ toYaml $.Values.secondaryWorkload.istio.destinationRule.trafficPolicy | indent 4 }}
{{- end }}
{{- end }}
{{- end }}
73 changes: 72 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 @@ -5,6 +5,8 @@ kind: VirtualService
metadata:
{{- if .virtualService.name }}
name: {{ .virtualService.name }}
{{- else if $.Values.virtualServiceName }}
name: {{ $.Values.virtualServiceName }}
{{- else }}
name: {{ template ".Chart.Name .fullname" $ }}-virtualservice
{{- end }}
Expand Down Expand Up @@ -34,7 +36,7 @@ spec:
- {{ . | quote }}
{{- end }}
{{- end }}
{{- if or .gateway.enabled .virtualService.hosts }}
{{- if or .gateway.enabled .virtualService.hosts $.Values.virtualServiceHosts }}
hosts:
{{- if .gateway.enabled }}
{{- if .gateway.host }}
Expand All @@ -48,6 +50,9 @@ spec:
{{- range .virtualService.hosts }}
- {{ . | quote }}
{{- end }}
{{- range $.Values.virtualServiceHosts }}
- {{ . | quote }}
{{- end }}
{{- else }}
hosts:
- "{{ include ".servicename" $ }}.{{ $.Release.Namespace }}.svc.cluster.local"
Expand All @@ -57,4 +62,70 @@ spec:
{{ toYaml $.Values.istio.virtualService.http | indent 4 }}
{{- end }}
{{- end }}
{{- end }}
---
{{- with .Values.istio }}
{{- if and .enable .virtualService.enabled $.Values.secondaryWorkload.istio.virtualService.enabled }}
apiVersion: networking.istio.io/v1beta1
kind: VirtualService
metadata:
{{- if $.Values.secondaryWorkload.istio.virtualService.name }}
name: {{ $.Values.secondaryWorkload.istio.virtualService.name }}
{{- else if $.Values.secondaryWorkload.virtualServiceName }}
name: {{ $.Values.secondaryWorkload.virtualServiceName }}
{{- else }}
name: {{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}-virtualservice
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" $ }}
release: {{ $.Release.Name }}
{{- if $.Values.appLabels }}
{{ toYaml $.Values.appLabels | indent 4 }}
{{- end }}
{{- if $.Values.secondaryWorkload.istio.virtualService.labels }}
{{ toYaml $.Values.secondaryWorkload.istio.virtualService.labels | indent 4 }}
{{- end }}
{{- if $.Values.secondaryWorkload.istio.virtualService.annotations }}
annotations:
{{ toYaml $.Values.secondaryWorkload.istio.virtualService.annotations | indent 4 }}
{{- end }}
spec:
{{- if or .gateway.enabled $.Values.secondaryWorkload.istio.virtualService.gateways }}
gateways:
{{- if .gateway.enabled }}
- {{ template ".Chart.Name .fullname" $ }}-istio-gateway
{{- end }}
{{- range $.Values.secondaryWorkload.istio.virtualService.gateways }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{- if or .gateway.enabled $.Values.secondaryWorkload.istio.virtualService.hosts $.Values.secondaryWorkload.virtualServiceHosts }}
hosts:
{{- if .gateway.enabled }}
{{- if .gateway.host }}
- {{ .gateway.host | quote }}
{{- else if .gateway.hosts }}
{{- range .gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- range $.Values.secondaryWorkload.istio.virtualService.hosts }}
- {{ . | quote }}
{{- end }}
{{- range $.Values.secondaryWorkload.virtualServiceHosts }}
- {{ . | quote }}
{{- end }}
{{- else }}
hosts:
- "{{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}-service.{{ $.Release.Namespace }}.svc.cluster.local"
{{- end }}
{{- if $.Values.secondaryWorkload.istio.virtualService.http }}
http:
{{ toYaml $.Values.secondaryWorkload.istio.virtualService.http | indent 4 }}
{{- end }}
{{- end }}
{{- end }}
83 changes: 82 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 @@ -74,5 +74,86 @@ metadata:
{{- end }}
spec:
{{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }}

{{- end }}
{{- end }}
{{- end }}
---
{{- if $.Values.secondaryWorkload.kedaAutoscaling.enabled }}
apiVersion: keda.sh/v1alpha1
kind: ScaledObject
metadata:
{{- if $.Values.secondaryWorkload.kedaAutoscaling.name }}
name: {{ $.Values.secondaryWorkload.kedaAutoscaling.name }}
{{- else }}
name: {{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}-keda
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
chart: {{ template ".Chart.Name .chart" $ }}
release: {{ $.Release.Name }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
release: {{ .Release.Name }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
{{- if .Values.secondaryWorkload.kedaAutoscaling.labels }}
{{ toYaml .Values.secondaryWorkload.kedaAutoscaling.labels | indent 4 }}
{{- end }}
{{- if .Values.secondaryWorkload.kedaAutoscaling.annotations }}
annotations:
{{ toYaml .Values.secondaryWorkload.kedaAutoscaling.annotations | indent 4 }}
{{- end }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ $.Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" $) ($.Values.secondaryWorkload.postfix | default "sec")) }}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.envSourceContainerName }}
envSourceContainerName: {{ $.Values.secondaryWorkload.kedaAutoscaling.envSourceContainerName }}
{{- end }}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.pollingInterval }}
pollingInterval: {{ $.Values.secondaryWorkload.kedaAutoscaling.pollingInterval }}
{{- end }}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.cooldownPeriod }}
cooldownPeriod: {{ $.Values.secondaryWorkload.kedaAutoscaling.cooldownPeriod }}
{{- end }}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.idleReplicaCount }}
idleReplicaCount: {{ $.Values.secondaryWorkload.kedaAutoscaling.idleReplicaCount }}
{{- end }}
minReplicaCount: {{ $.Values.secondaryWorkload.kedaAutoscaling.minReplicaCount }}
maxReplicaCount: {{ $.Values.secondaryWorkload.kedaAutoscaling.maxReplicaCount }}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.fallback }}
fallback:
{{ toYaml $.Values.secondaryWorkload.kedaAutoscaling.fallback | indent 4 }}
{{- end }}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.advanced }}
advanced:
{{ toYaml $.Values.secondaryWorkload.kedaAutoscaling.advanced | indent 4 }}
{{- end }}
triggers:
{{ toYaml .Values.secondaryWorkload.kedaAutoscaling.triggers | indent 2}}
{{- if $.Values.secondaryWorkload.kedaAutoscaling.authenticationRef }}
authenticationRef:
{{ toYaml $.Values.secondaryWorkload.kedaAutoscaling.authenticationRef | indent 6 }}
{{- end }}
---
{{- if $.Values.secondaryWorkload.kedaAutoscaling.triggerAuthentication.enabled }}
apiVersion: keda.sh/v1alpha1
kind: TriggerAuthentication
metadata:
name: {{ $.Values.secondaryWorkload.kedaAutoscaling.triggerAuthentication.name }}
labels:
app: {{ template ".Chart.Name .name" $ }}
chart: {{ template ".Chart.Name .chart" $ }}
release: {{ $.Release.Name }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{ toYaml $.Values.secondaryWorkload.kedaAutoscaling.triggerAuthentication.spec | indent 2 }}
{{- end }}
{{- end }}
---
79 changes: 79 additions & 0 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,83 @@ spec:
app: {{ template ".Chart.Name .name" . }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

---
{{- if .Values.secondaryWorkload.service.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.secondaryWorkload.fullnameOverride | default (printf "%s-%s" (include ".Chart.Name .fullname" .) (.Values.secondaryWorkload.postfix | default "sec")) }}-service
labels:
app: {{ template ".Chart.Name .name" . }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" . }}
release: {{ .Release.Name }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
{{- if .Values.secondaryWorkload.service.annotations }}
annotations:
{{ toYaml .Values.secondaryWorkload.service.annotations | indent 4 }}
{{- end}}
spec:
type: {{ .Values.secondaryWorkload.service.type | default .Values.service.type | default "ClusterIP" }}
{{- with .Values.secondaryWorkload.service.extraSpec }}
{{- toYaml . | nindent 2 }}
{{- end }}
{{- if (eq (.Values.secondaryWorkload.service.type | default .Values.service.type | default "ClusterIP") "LoadBalancer") }}
{{- if .Values.secondaryWorkload.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.secondaryWorkload.service.loadBalancerIP }}
{{- end }}
{{- if .Values.secondaryWorkload.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges:
{{- range .Values.secondaryWorkload.service.loadBalancerSourceRanges }}
- {{ . }}
{{- end }}
{{- end }}
{{- end }}
ports:
{{- $containerPorts := .Values.secondaryWorkload.ContainerPort | default .Values.ContainerPort }}
{{- range $containerPorts }}
{{- if .servicePort }}
- port: {{ .servicePort }}
{{- else }}
- port: {{ .port }}
{{- end }}
{{- if .targetPort }}
targetPort: {{ .targetPort }}
{{- else if $.Values.appMetrics }}
targetPort: envoy-{{ .name }}
{{- else }}
targetPort: {{ .name }}
{{- end }}
protocol: {{ .protocol | default "TCP" }}
{{- if (and (eq ($.Values.secondaryWorkload.service.type | default $.Values.service.type | default "ClusterIP") "NodePort") .nodePort ) }}
nodePort: {{ .nodePort }}
{{- end }}
name: {{ .name }}
{{- end }}
{{- if $.Values.appMetrics }}
- port: 9901
name: envoy-admin
{{- end }}
selector:
{{- if .Values.secondaryWorkload.customPodLabels }}
{{ toYaml .Values.secondaryWorkload.customPodLabels | indent 4 }}
{{- else if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 4 }}
{{- else }}
app: {{ template ".Chart.Name .name" . }}
{{- end }}
workload: secondary
{{- if .Values.secondaryWorkload.service.sessionAffinity.enabled }}
sessionAffinity: ClientIP
{{- end }}
{{- if .Values.secondaryWorkload.service.sessionAffinityConfig }}
sessionAffinityConfig:
{{ toYaml .Values.secondaryWorkload.service.sessionAffinityConfig | indent 4 }}
{{- end }}
{{- end }}
Loading
Loading