From 5261fa85998d3b22cf347432e70063221c192379 Mon Sep 17 00:00:00 2001
From: onedr0p <onedr0p@noreply.gitea.io>
Date: Wed, 2 Sep 2020 12:09:24 +0000
Subject: [PATCH] Let service.ssh.externalIPs and
 service.ssh.externalTrafficPolicy be configurable (#15)

remove Cluster from readme

externalTrafficPolicy and externalIPs example in values

document service.ssh.externalTrafficPolicy and service.ssh.externalIPs

bump chart version

externalIPs and externalTrafficPolicy

let service.ssh.externalIPs and service.ssh.externalTrafficPolicy be configurable

Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/15
Reviewed-by: luhahn <luhahn@noreply.gitea.io>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
---
 Chart.yaml                   | 2 +-
 README.md                    | 2 ++
 templates/gitea/ssh-svc.yaml | 9 ++++++++-
 values.yaml                  | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index c9578b0..5bcddf4 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: gitea
 description: Gitea Helm chart for Kubernetes
 type: application
-version: 1.4.1
+version: 1.4.2
 appVersion: 1.12.3
 icon: https://docs.gitea.io/images/gitea.png
 
diff --git a/README.md b/README.md
index 7becfa8..e427daa 100644
--- a/README.md
+++ b/README.md
@@ -201,6 +201,8 @@ Like the admin user the ldap settings can be updated but also disabled or delete
 |service.http.port| Port for web traffic | 3000 |
 |service.ssh.type| Kubernetes service type for ssh traffic | ClusterIP |
 |service.ssh.port| Port for ssh traffic | 22 |
+|service.ssh.externalTrafficPolicy| If `service.ssh.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable source IP preservation | |
+|service.ssh.externalIPs| SSH service external IP addresses |[]|
 |service.ssh.annotations| Additional ssh annotations for the ssh service ||
 
 ### Gitea Configuration
diff --git a/templates/gitea/ssh-svc.yaml b/templates/gitea/ssh-svc.yaml
index 793fcb6..d66f634 100644
--- a/templates/gitea/ssh-svc.yaml
+++ b/templates/gitea/ssh-svc.yaml
@@ -14,12 +14,19 @@ spec:
   {{- if ne .Values.service.ssh.type "LoadBalancer" }}
   clusterIP: None
   {{- end }}
+  {{- if .Values.service.ssh.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.service.ssh.externalIPs | indent 4 }}
+  {{- end }}
+  {{- if .Values.service.ssh.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.ssh.externalTrafficPolicy }}
+  {{- end }}
   ports:
   - name: ssh
     port: {{ .Values.service.ssh.port }}
     targetPort: {{ .Values.gitea.config.server.SSH_LISTEN_PORT }}
     protocol: TCP
-    {{- if  .Values.service.ssh.nodePort }}
+    {{- if .Values.service.ssh.nodePort }}
     nodePort: {{ .Values.service.ssh.nodePort }}
     {{- end }}
   selector:
diff --git a/values.yaml b/values.yaml
index 00d74c4..18335bb 100644
--- a/values.yaml
+++ b/values.yaml
@@ -20,6 +20,8 @@ service:
     port: 22
     #loadBalancerIP:
     #nodePort:
+    #externalTrafficPolicy:
+    #externalIPs:
     annotations:
 
 ingress: