use new sftp-server docker image + fix #15

Author: edevosc2c

sftp/Chart.yaml

@@ -4,6 +4,6 @@ description: A Helm chart for deploying a SFTP stack
 
 type: application
 
-version: 1.3.0
+version: 1.4.0
 
 appVersion: "1.0"

sftp/templates/sftp-cm.yaml

@@ -4,20 +4,7 @@ metadata:
   name: {{ include "sftp.fullname" . }}-sftp-cm
   labels:
     {{- include "sftp.labels" . | nindent 4 }}
-    app.georchestra.org: sftp
+    app.kubernetes.io/name: sftp
 data:
   authorized_keys: |
     {{- .Values.sftp.authorized_keys | nindent 4 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "sftp.fullname" . }}-sftp-hostkeys-cm
-  labels:
-    {{- include "sftp.labels" . | nindent 4 }}
-    app.georchestra.org: sftp
-data:
-  {{- range $filename, $contents := .Values.sftp.host_keys }}
-  {{ $filename }}: |
-    {{- $contents | trim | nindent 4 }}
-  {{- end }}

sftp/templates/sftp-depl.yaml

@@ -4,17 +4,19 @@ metadata:
   name: {{ include "sftp.fullname" . }}-sftp-depl
   labels:
     {{- include "sftp.labels" . | nindent 4 }}
-    app.georchestra.org: sftp
+    app.kubernetes.io/name: sftp
 spec:
   selector:
     matchLabels:
       {{- include "sftp.selectorLabels" . | nindent 6 }}
-      app.georchestra.org: sftp
+      app.kubernetes.io/name: sftp
   template:
     metadata:
       labels:
         {{- include "sftp.selectorLabels" . | nindent 8 }}
-        app.georchestra.org: sftp
+        app.kubernetes.io/name: sftp
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/sftp-cm.yaml") . | sha256sum }}
     spec:
       {{- with .Values.sftp.imagePullSecrets }}
       imagePullSecrets:

sftp/templates/sftp-hostkeys-cm.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "sftp.fullname" . }}-sftp-hostkeys-cm
+  labels:
+    {{- include "sftp.labels" . | nindent 4 }}
+    app.kubernetes.io/name: sftp
+data:
+  {{- range $filename, $contents := .Values.sftp.host_keys }}
+  {{ $filename }}: |
+    {{- $contents | trim | nindent 4 }}
+  {{- end }}

sftp/templates/sftp-svc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ include "sftp.fullname" . }}-sftp-svc
   labels:
     {{- include "sftp.labels" . | nindent 4 }}
-    app.georchestra.org: sftp
+    app.kubernetes.io/name: sftp
 spec:
   type: {{ .Values.sftp.service.type }}
   {{- if .Values.sftp.service.externalTrafficPolicy }}

sftp/values.yaml

@@ -6,17 +6,17 @@ sftp:
   #  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
+  image: ghcr.io/camptocamp/georchestra-docker-images/sftp-server:latest
   imagePullPolicy: Always
-  #lifecycle:
+  lifecycle: {}
   #  postStart:
   #    exec:
   #      command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
   #  preStop:
   #    exec:
   #      command: ["/bin/sh","-c","nginx -s quit; while killall -0 nginx; do sleep 1; done"]
 
-  #imagePullSecrets:
+  imagePullSecrets: []
   #- name: secret
 
   customHostname: "{{ .Release.Name }}-{{ .Release.Namespace }}"