From 028a12dd4c2a3e498802eca90c7eb17d9d1e06c9 Mon Sep 17 00:00:00 2001 From: Badal Kumar Prusty Date: Tue, 1 Jul 2025 18:28:13 +0530 Subject: [PATCH] added support for service extraSpec --- .../deployment-chart_4-20-0/templates/service.yaml | 14 +++++++++++--- .../deployment-chart_4-21-0/templates/service.yaml | 14 +++++++++++--- .../deployment-chart_4-21-0/test_values.yaml | 4 ++++ .../reference-chart_5-0-0/templates/service.yaml | 14 +++++++++++--- .../reference-chart_5-1-0/templates/service.yaml | 14 +++++++++++--- .../statefulset-chart_5-0-0/templates/service.yaml | 14 +++++++++++--- .../statefulset-chart_5-1-0/templates/service.yaml | 14 +++++++++++--- 7 files changed, 70 insertions(+), 18 deletions(-) diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml index 14e1a7c37a..99293e4e6e 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml @@ -18,11 +18,19 @@ metadata: {{- end}} spec: type: {{ .Values.service.type | default "ClusterIP" }} -{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} +{{- with .Values.service.extraSpec }} + {{- toYaml . | nindent 2 }} + {{- end }} +{{- if (eq .Values.service.type "LoadBalancer") }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: - {{- range .Values.service.loadBalancerSourceRanges }} + {{- range .Values.service.loadBalancerSourceRanges }} - {{ . }} - {{- end }} + {{- end }} + {{- end }} {{- end }} ports: {{- range .Values.ContainerPort }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/service.yaml index 14e1a7c37a..99293e4e6e 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/service.yaml @@ -18,11 +18,19 @@ metadata: {{- end}} spec: type: {{ .Values.service.type | default "ClusterIP" }} -{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} +{{- with .Values.service.extraSpec }} + {{- toYaml . | nindent 2 }} + {{- end }} +{{- if (eq .Values.service.type "LoadBalancer") }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: - {{- range .Values.service.loadBalancerSourceRanges }} + {{- range .Values.service.loadBalancerSourceRanges }} - {{ . }} - {{- end }} + {{- end }} + {{- end }} {{- end }} ports: {{- range .Values.ContainerPort }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml index 48e62037f6..f3b2bb0604 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml @@ -158,6 +158,10 @@ service: type: ClusterIP # name: "1234567890123456789012345678901234567890123456789012345678901234567890" annotations: {} + # loadBalancerIP: "98.73.123.45" + # loadBalancerSourceRanges: ["127.0.0.1","127.0.0.1","127.0.0.1"] + extraSpec: {} +# externalTrafficPolicy: Local # test1: test2 # test3: test4 diff --git a/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/service.yaml index 2c31e1450d..5c06e2352d 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/service.yaml @@ -18,11 +18,19 @@ metadata: {{- end}} spec: type: {{ .Values.service.type | default "ClusterIP" }} -{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} +{{- with .Values.service.extraSpec }} + {{- toYaml . | nindent 2 }} + {{- end }} +{{- if (eq .Values.service.type "LoadBalancer") }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: - {{- range .Values.service.loadBalancerSourceRanges }} + {{- range .Values.service.loadBalancerSourceRanges }} - {{ . }} - {{- end }} + {{- end }} + {{- end }} {{- end }} ports: {{- range .Values.ContainerPort }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/service.yaml index 6853027e9a..6dfea45c80 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/service.yaml @@ -18,11 +18,19 @@ metadata: {{- end}} spec: type: {{ .Values.service.type | default "ClusterIP" }} -{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} +{{- with .Values.service.extraSpec }} + {{- toYaml . | nindent 2 }} + {{- end }} +{{- if (eq .Values.service.type "LoadBalancer") }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: - {{- range .Values.service.loadBalancerSourceRanges }} + {{- range .Values.service.loadBalancerSourceRanges }} - {{ . }} - {{- end }} + {{- end }} + {{- end }} {{- end }} ports: {{- range .Values.ContainerPort }} diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/service.yaml index 795558b2bc..831f591ed8 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/service.yaml @@ -22,11 +22,19 @@ metadata: {{- end }} spec: type: {{ .Values.service.type | default "ClusterIP" }} -{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} +{{- with .Values.service.extraSpec }} + {{- toYaml . | nindent 2 }} + {{- end }} +{{- if (eq .Values.service.type "LoadBalancer") }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: - {{- range .Values.service.loadBalancerSourceRanges }} + {{- range .Values.service.loadBalancerSourceRanges }} - {{ . }} - {{- end }} + {{- end }} + {{- end }} {{- end }} ports: {{- range .Values.ContainerPort }} diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml index fefb11d79f..ccfba4af62 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml @@ -22,11 +22,19 @@ metadata: {{- end }} spec: type: {{ .Values.service.type | default "ClusterIP" }} -{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}} +{{- with .Values.service.extraSpec }} + {{- toYaml . | nindent 2 }} + {{- end }} +{{- if (eq .Values.service.type "LoadBalancer") }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: - {{- range .Values.service.loadBalancerSourceRanges }} + {{- range .Values.service.loadBalancerSourceRanges }} - {{ . }} - {{- end }} + {{- end }} + {{- end }} {{- end }} ports: {{- range .Values.ContainerPort }}