Upgraded to Helm API v2 (Helm 3+)

azure-pipelines.yaml

@@ -1,7 +1,7 @@
 name: $(version).$(Rev:r)
 
 variables:
-  version: 3.0
+  version: 4.0
   buildConfiguration: "Release"
   imageRepository: "emberstack/sftp"
   DOCKER_CLI_EXPERIMENTAL: 'enabled'

src/deploy/helm/sftp/.helmignore

@@ -14,6 +14,7 @@
 *.swp
 *.bak
 *.tmp
+*.orig
 *~
 # Various IDEs
 .project

src/deploy/helm/sftp/Chart.yaml

@@ -1,8 +1,11 @@
-apiVersion: v1
-description: A Helm chart to deploy SFTP
-icon: https://raw.githubusercontent.com/EmberStack/CDN/master/Projects/docker-sftp/openssh.png
+apiVersion: v2
 name: sftp
+description: A Helm chart to deploy SFTP
+type: application
 version: 0.1.0
+appVersion: 0.1.0
+
+icon: https://raw.githubusercontent.com/EmberStack/CDN/master/Projects/docker-sftp/openssh.png
 keywords:
 - sftp
 - openssh
@@ -15,4 +18,3 @@ sources:
 maintainers:
 - name: winromulus
   email: [email protected]
-engine: gotpl

src/deploy/helm/sftp/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 emberstack
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019 emberstack
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/deploy/helm/sftp/templates/_helpers.tpl

@@ -35,11 +35,29 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "sftp.labels" -}}
-app.kubernetes.io/name: {{ include "sftp.name" . }}
 helm.sh/chart: {{ include "sftp.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "sftp.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "sftp.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "sftp.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "sftp.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "sftp.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}

src/deploy/helm/sftp/templates/config-secret.yaml

@@ -4,7 +4,7 @@ kind: Secret
 metadata:
   name: {{ template "sftp.fullname" . }}
   labels:
-{{ include "sftp.labels" . | indent 4 }}
+    {{- include "sftp.labels" . | nindent 4 }}
 type: Opaque
 stringData:
   sftp.json: |-

src/deploy/helm/sftp/templates/deployment.yaml

@@ -3,29 +3,32 @@ kind: Deployment
 metadata:
   name: {{ include "sftp.fullname" . }}
   labels:
-{{ include "sftp.labels" . | indent 4 }}
+    {{- include "sftp.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "sftp.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "sftp.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "sftp.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- include "sftp.selectorLabels" . | nindent 8 }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
+      serviceAccountName: {{ include "sftp.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       {{- with .Values.initContainers }}
       initContainers:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
           {{- if .Values.image.tag }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           {{- else }}
@@ -47,7 +50,13 @@ spec:
           {{- with .Values.storage.volumeMounts }}
           {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- end }}
+          {{- end }}    
+          livenessProbe:
+            tcpSocket:
+              port: ssh
+          readinessProbe:
+            tcpSocket:
+              port: ssh
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- if or .Values.configuration .Values.storage.volumes }}

src/deploy/helm/sftp/templates/service.yaml

@@ -3,11 +3,11 @@ kind: Service
 metadata:
   name: {{ include "sftp.fullname" . }}
   labels:
-{{ include "sftp.labels" . | indent 4 }}
-{{- if .Values.service.annotations }}
+    {{- include "sftp.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
   annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
 {{- if ne .Values.service.type "NodePort" }}
 {{- if .Values.service.clusterIP }}
@@ -35,5 +35,4 @@ spec:
       protocol: TCP
       name: ssh
   selector:
-    app.kubernetes.io/name: {{ include "sftp.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "sftp.selectorLabels" . | nindent 4 }}

src/deploy/helm/sftp/templates/serviceaccount.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "sftp.serviceAccountName" . }}
+  labels:
+    {{- include "sftp.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end -}}

src/deploy/helm/sftp/values.yaml

@@ -13,14 +13,31 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-
 configuration: null
 
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
 storage:
   volumeMounts: []
   volumes: []
 
-
 initContainers: []
 
 service: