From 7dcf013b6f1c56977a734cec463f276ee333f023 Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Thu, 5 Sep 2024 13:48:36 -0500
Subject: [PATCH 1/2] Allow to pass allocateLoadBalancerNodePorts in Service
 for SSH, mirror

---
 charts/gitlab/charts/gitlab-shell/templates/service.yaml | 3 +++
 charts/gitlab/charts/gitlab-shell/values.schema.json     | 4 ++++
 charts/gitlab/charts/gitlab-shell/values.yaml            | 1 +
 3 files changed, 8 insertions(+)

diff --git a/charts/gitlab/charts/gitlab-shell/templates/service.yaml b/charts/gitlab/charts/gitlab-shell/templates/service.yaml
index af75b49709..571d62d4a2 100644
--- a/charts/gitlab/charts/gitlab-shell/templates/service.yaml
+++ b/charts/gitlab/charts/gitlab-shell/templates/service.yaml
@@ -29,6 +29,9 @@ spec:
   {{- if or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer") }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   {{- end }}
+  {{- if and (eq .Values.service.type "NodePort") (hasKey .Values.service "allocateLoadBalancerNodePorts" }}
+  allocateLoadBalancerNodePorts: {{ .Values.service.allocateLoadBalancerNodePorts }}
+  {{- end }}
 {{- if .Values.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.service.loadBalancerIP }}
 {{- end }}
diff --git a/charts/gitlab/charts/gitlab-shell/values.schema.json b/charts/gitlab/charts/gitlab-shell/values.schema.json
index e6d346ecfc..5eb139d47e 100644
--- a/charts/gitlab/charts/gitlab-shell/values.schema.json
+++ b/charts/gitlab/charts/gitlab-shell/values.schema.json
@@ -447,6 +447,10 @@
           "title": "IP address to assign to LoadBalancer",
           "type": "string"
         },
+        "allocateLoadBalancerNodePorts": {
+          "title": "If the LoadBalancer Service should also have a NodePort",
+          "type": "boolean"
+        },
         "loadBalancerSourceRanges": {
           "title": "List of IP CIDRs allowed access to LoadBalancer",
           "type": "array"
diff --git a/charts/gitlab/charts/gitlab-shell/values.yaml b/charts/gitlab/charts/gitlab-shell/values.yaml
index 9ee90e3748..578b603179 100644
--- a/charts/gitlab/charts/gitlab-shell/values.yaml
+++ b/charts/gitlab/charts/gitlab-shell/values.yaml
@@ -12,6 +12,7 @@ service:
   internalPort: 2222
   externalTrafficPolicy: Cluster
   # nodePort: xxx
+  # allocateLoadBalancerNodePorts: true
   # loadBalancerIP: x.x.x.x
   # loadBalancerSourceRanges:
   # - x.x.x.x/yy
-- 
GitLab


From 8c225fd1e1e71ba3cbb17e60ff7f09fd3fa53778 Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Thu, 5 Sep 2024 14:00:49 -0500
Subject: [PATCH 2/2] fix syntax error

---
 charts/gitlab/charts/gitlab-shell/templates/service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/gitlab-shell/templates/service.yaml b/charts/gitlab/charts/gitlab-shell/templates/service.yaml
index 571d62d4a2..a390ec6cb4 100644
--- a/charts/gitlab/charts/gitlab-shell/templates/service.yaml
+++ b/charts/gitlab/charts/gitlab-shell/templates/service.yaml
@@ -29,7 +29,7 @@ spec:
   {{- if or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer") }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   {{- end }}
-  {{- if and (eq .Values.service.type "NodePort") (hasKey .Values.service "allocateLoadBalancerNodePorts" }}
+  {{- if and (eq .Values.service.type "NodePort") (hasKey .Values.service "allocateLoadBalancerNodePorts") }}
   allocateLoadBalancerNodePorts: {{ .Values.service.allocateLoadBalancerNodePorts }}
   {{- end }}
 {{- if .Values.service.loadBalancerIP }}
-- 
GitLab