Added more flexible helm chart

helm/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -1,2 +1,24 @@
-name: ovpn-admin
-version: 1.0.0
+apiVersion: v2
+name: ovpn-admin-chart
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"

helm/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ovpn-admin-chart.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ovpn-admin-chart.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ovpn-admin-chart.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "ovpn-admin-chart.labels" -}}
+helm.sh/chart: {{ include "ovpn-admin-chart.chart" . }}
+{{ include "ovpn-admin-chart.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "ovpn-admin-chart.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ovpn-admin-chart.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "ovpn-admin-chart.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "ovpn-admin-chart.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

helm/templates/deployment.yaml

@@ -1,117 +1,125 @@
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: openvpn
+  name: {{ include "ovpn-admin-chart.fullname" . }}
+  labels:
+    {{- include "ovpn-admin-chart.labels" . | nindent 4 }}
 spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
-      app: openvpn
+      {{- include "ovpn-admin-chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
-        app: openvpn
+        {{- include "ovpn-admin-chart.selectorLabels" . | nindent 8 }}
     spec:
-      {{- if .Values.openvpn.nodeSelector }}
-      nodeSelector:
-      {{- .Values.openvpn.nodeSelector | toYaml | indent 8 | printf "\n%s" }}
-      {{- end }}
-      {{- if .Values.openvpn.tolerations }}
-      tolerations:
-      {{- .Values.openvpn.tolerations | toYaml | indent 8 | printf "\n%s" }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      terminationGracePeriodSeconds: 0
-      serviceAccountName: openvpn
+      serviceAccountName: {{ include "ovpn-admin-chart.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
-      - name: ovpn-admin
-        image: {{ .Values.ovpnAdmin.image }}
-        command:
-        - /bin/sh
-        - -c
-        - /app/ovpn-admin
+        - name: openvpn
+          securityContext:
+            {{- toYaml .Values.openvpnSecurityContext | nindent 12 }}
+          image: "{{ .Values.openvpn.image.repository }}:{{ .Values.openvpn.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.openvpn.image.pullPolicy }}
+          command: [ '/entrypoint.sh' ]
+          ports:
+          - name: openvpn-tcp
+            protocol: TCP
+            containerPort: 1194
+          volumeMounts:
+          - name: tmp
+            mountPath: /tmp
+          - name: dev-net
+            mountPath: /dev/net
+          - name: certs
+            mountPath: /etc/openvpn/certs
+          - name: ccd
+            mountPath: /etc/openvpn/ccd
+          - name: config
+            mountPath: /etc/openvpn/openvpn.conf
+            subPath: openvpn.conf
+            readOnly: true
+          - name: entrypoint
+            mountPath: /entrypoint.sh
+            subPath: entrypoint.sh
+            readOnly: true
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.openvpnAdminSecurityContext | nindent 12 }}
+          image: "{{ .Values.openvpnAdmin.image.repository }}:{{ .Values.openvpnAdmin.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.openvpnAdmin.image.pullPolicy }}
+          command:
+          - /bin/sh
+          - -c
+          - /app/ovpn-admin
             --storage.backend="kubernetes.secrets"
             --listen.host="0.0.0.0"
             --listen.port="8000"
             --role="master"
-            {{- if hasKey .Values.openvpn "inlet" }}
-              {{- if eq .Values.openvpn.inlet "LoadBalancer" }}
+            {{- if eq .Values.service.openvpn.connectionType "LoadBalancer" }}
             --ovpn.server.behindLB
             --ovpn.service="openvpn-external"
-              {{- end }}
             {{- end }}
             --mgmt=main="127.0.0.1:8989"
             --ccd --ccd.path="/mnt/ccd"
             --easyrsa.path="/mnt/certs"
             {{- $externalHost := "" }}
-            {{- if hasKey .Values.openvpn "inlet" }}
-              {{- if eq .Values.openvpn.inlet "ExternalIP" }}{{ $externalHost = .Values.openvpn.externalIP }}{{- end }}
-            {{- end }}
-            {{- if hasKey .Values.openvpn "externalHost" }}{{ $externalHost = .Values.openvpn.externalHost }}{{- end }}
+            {{- if eq .Values.service.openvpn.connectionType "ExternalIP" }}{{ $externalHost = .Values.service.openvpn.externalIP }}{{- end }}
+            {{- if ((.Values.service.openvpn).externalHost) }}{{ $externalHost = .Values.service.openvpn.externalHost }}{{- end }}
             {{- if ne $externalHost "" }}
             --ovpn.server="{{ $externalHost }}:{{ .Values.openvpn.externalPort | default 5416 | quote }}:tcp"
             {{- end }}
-        ports:
-        - name: ovpn-admin
-          protocol: TCP
-          containerPort: 8000
-        volumeMounts:
+          ports:
+            - name: http
+              containerPort: 8000
+              protocol: TCP
+          volumeMounts:
           - name: certs
             mountPath: /mnt/certs
           - name: ccd
             mountPath: /mnt/ccd
-      - name: openvpn
-        image: {{ .Values.openvpn.image }}
-        command: [ '/entrypoint.sh' ]
-        # imagePullPolicy: Always
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            add:
-            - NET_ADMIN
-            - NET_RAW
-            - MKNOD
-            - SETGID
-            - SETUID
-            drop:
-            - ALL
-        ports:
-        - name: openvpn-tcp
-          protocol: TCP
-          containerPort: 1194
-          {{- if eq .Values.openvpn.inlet "HostPort" }}
-          hostPort: {{ .Values.openvpn.hostPort }}
-          {{- end }}
-        volumeMounts:
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      volumes:
         - name: tmp
-          mountPath: /tmp
+          emptyDir: {}
         - name: dev-net
-          mountPath: /dev/net
+          emptyDir: {}
         - name: certs
-          mountPath: /etc/openvpn/certs
+          emptyDir: {}
         - name: ccd
-          mountPath: /etc/openvpn/ccd
+          emptyDir: {}
         - name: config
-          mountPath: /etc/openvpn/openvpn.conf
-          subPath: openvpn.conf
-          readOnly: true
+          configMap:
+            name: openvpn
+            defaultMode: 0644
         - name: entrypoint
-          mountPath: /entrypoint.sh
-          subPath: entrypoint.sh
-          readOnly: true
-      volumes:
-      - name: tmp
-        emptyDir: {}
-      - name: dev-net
-        emptyDir: {}
-      - name: certs
-        emptyDir: {}
-      - name: ccd
-        emptyDir: {}
-      - name: config
-        configMap:
-          name: openvpn
-          defaultMode: 0644
-      - name: entrypoint
-        configMap:
-          name: openvpn
-          defaultMode: 0755
+          configMap:
+            name: openvpn
+            defaultMode: 0755
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

helm/templates/hpa.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "ovpn-admin-chart.fullname" . }}
+  labels:
+    {{- include "ovpn-admin-chart.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "ovpn-admin-chart.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}