diff --git a/sftp/Chart.yaml b/sftp/Chart.yaml index 5154ebd..7b444d9 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: 1.3.0 +version: 1.4.0 appVersion: "1.0" diff --git a/sftp/templates/sftp-cm.yaml b/sftp/templates/sftp-cm.yaml index be54d17..92e8a60 100644 --- a/sftp/templates/sftp-cm.yaml +++ b/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 }} diff --git a/sftp/templates/sftp-depl.yaml b/sftp/templates/sftp-depl.yaml index 9fd2b86..5056ea6 100644 --- a/sftp/templates/sftp-depl.yaml +++ b/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: diff --git a/sftp/templates/sftp-hostkeys-cm.yaml b/sftp/templates/sftp-hostkeys-cm.yaml new file mode 100644 index 0000000..87a3e41 --- /dev/null +++ b/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 }} diff --git a/sftp/templates/sftp-svc.yaml b/sftp/templates/sftp-svc.yaml index 190e2f0..e5b2bc1 100644 --- a/sftp/templates/sftp-svc.yaml +++ b/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 }} diff --git a/sftp/values.yaml b/sftp/values.yaml index 6fcb0f6..2a1d4f0 100644 --- a/sftp/values.yaml +++ b/sftp/values.yaml @@ -6,9 +6,9 @@ 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"] @@ -16,7 +16,7 @@ sftp: # 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 }}"