add ability to specify externalTrafficPolicy and allow customized por…

…t sftp
camptocamp · Mar 7, 2024 · 7fa501f · 7fa501f
1 parent 44d9ace
commit 7fa501f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: