From 7fa501feb716af27c8cbd921cf5323b2a89fe808 Mon Sep 17 00:00:00 2001
From: Emilien Devos <121870973+edevosc2c@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:31:20 +0100
Subject: [PATCH] add ability to specify externalTrafficPolicy and allow
 customized port sftp

---
 pgbouncer/Chart.yaml             | 2 +-
 pgbouncer/templates/service.yaml | 3 +++
 pgbouncer/values.yaml            | 2 ++
 sftp/Chart.yaml                  | 2 +-
 sftp/templates/sftp-svc.yaml     | 5 ++++-
 sftp/values.yaml                 | 3 +++
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pgbouncer/Chart.yaml b/pgbouncer/Chart.yaml
index fda0ceb..e2ac2f7 100644
--- a/pgbouncer/Chart.yaml
+++ b/pgbouncer/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.18.0"
 description: A Helm chart installing pgbouncer in kubernetes
 name: pgbouncer
-version: 1.5.0
+version: 1.6.0
diff --git a/pgbouncer/templates/service.yaml b/pgbouncer/templates/service.yaml
index ade6e39..352d228 100644
--- a/pgbouncer/templates/service.yaml
+++ b/pgbouncer/templates/service.yaml
@@ -13,6 +13,9 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: psql
diff --git a/pgbouncer/values.yaml b/pgbouncer/values.yaml
index 588fedb..01e0c80 100644
--- a/pgbouncer/values.yaml
+++ b/pgbouncer/values.yaml
@@ -89,6 +89,8 @@ image:
 service:
   type: ClusterIP
   port: 5432
+  # Set to local if want to preserve source IP for NodePort or LoadBalancer
+  # externalTrafficPolicy: Cluster
   # nodePort: 30543 # when type NodePort
   annotations: {}
 
diff --git a/sftp/Chart.yaml b/sftp/Chart.yaml
index 460a69e..cca71ba 100644
--- a/sftp/Chart.yaml
+++ b/sftp/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for deploying a SFTP stack
 
 type: application
 
-version: 0.3.0
+version: 1.0.0
 
 appVersion: "1.0"
diff --git a/sftp/templates/sftp-svc.yaml b/sftp/templates/sftp-svc.yaml
index a79d474..190e2f0 100644
--- a/sftp/templates/sftp-svc.yaml
+++ b/sftp/templates/sftp-svc.yaml
@@ -7,8 +7,11 @@ metadata:
     app.georchestra.org: sftp
 spec:
   type: {{ .Values.sftp.service.type }}
+  {{- if .Values.sftp.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.sftp.service.externalTrafficPolicy }}
+  {{- end }}
   ports:
-    - port: 22
+    - port: {{ .Values.sftp.service.port }}
       protocol: TCP
       targetPort: 22
       {{- if .Values.sftp.service.nodePort }}
diff --git a/sftp/values.yaml b/sftp/values.yaml
index 5f4d1cf..0893b0f 100644
--- a/sftp/values.yaml
+++ b/sftp/values.yaml
@@ -2,7 +2,10 @@
 sftp:
   service:
     type: "ClusterIP" # or NodePort or LoadBalancer
+    port: 22
   #  nodePort: 30022 # when type NodePort
+  #  Set to local if want to preserve source IP for NodePort or LoadBalancer
+  #  externalTrafficPolicy: Cluster
   image: camptocamp/sftp:bullseye-k8s-georchestra
   imagePullPolicy: Always
   #lifecycle: