Merge pull request #2 from duhow/main

feat: major rework of Helm Chart

Author: jbtronics

charts/part-db/Chart.yaml

@@ -1,7 +1,8 @@
-apiVersion: v1
+apiVersion: v2
 name: part-db
 
-version: 0.0.3
+version: 0.1.0
+type: application
 
 description: Part-DB inventory management system
 keywords:
@@ -10,12 +11,12 @@ keywords:
   - electronics
   - php
   - opensource
-engine: gotpl
-type: application
-home: https://github.com/Part-DB/Part-DB-server
+
+home: https://github.com/Part-DB/helm-charts
 sources:
   - https://github.com/Part-DB/Part-DB-server
 icon: https://part-db.github.io/helm-charts/icon.svg
+
 maintainers:
 - email: [email protected]
   name: Jan Böhmer

charts/part-db/templates/_helpers.tpl

@@ -11,8 +11,16 @@ 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).
 */}}
 {{- define "app.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- 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 -}}
 
 {{/*
@@ -22,17 +30,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Return the appropriate apiVersion for deployment.
-*/}}
-{{- define "app.deployment.apiVersion" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
-{{- print "apps/v1" -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Common labels
 */}}
@@ -50,3 +47,11 @@ Labels to use on deploy.spec.selector.matchLabels and svc.spec.selector
 app.kubernetes.io/name: {{ template "app.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
+
+{{- define "app.url" -}}
+{{- if .Values.ingress.enabled -}}
+{{ empty .Values.ingress.tls | ternary "http" "https" }}://{{ .Values.ingress.hostname }}
+{{- else -}}
+http://{{ include "app.name" . }}
+{{- end -}}
+{{- end -}}

charts/part-db/templates/config.yaml

@@ -0,0 +1,53 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ template "app.fullname" . }}-config
+  labels: {{ include "app.labels" . | nindent 4 }}
+stringData:
+{{- with .Values.app }}
+  APP_ENV: docker
+  DEFAULT_URI: "{{ .url | default ( include "app.url" $ ) }}"
+  BASE_CURRENCY: {{ .currency | quote }}
+  ALLOW_ATTACHMENT_DOWNLOADS: {{ .attachment_downloads | int | quote }}
+  USE_GRAVATAR: {{ .gravatar | int | quote }}
+  DEFAULT_LANG: {{ .lang }}
+  DEFAULT_TIMEZONE: {{ .tz | quote }}
+  ENFORCE_CHANGE_COMMENTS_FOR: {{ .enforce_change_comments | quote }}
+  MAX_ATTACHMENT_FILE_SIZE: "100M"
+  CHECK_FOR_UPDATES: "0"
+  HISTORY_SAVE_CHANGED_FIELDS: "true"
+  HISTORY_SAVE_CHANGED_DATA: "true"
+  HISTORY_SAVE_REMOVED_DATA: "true"
+{{- end }}
+{{- with .Values.db }}
+  DB_TYPE: {{ .type }}
+  {{- if eq .type "sqlite" }}
+  DATABASE_URL: "sqlite:///%kernel.project_dir%/var/db/app.db"
+  {{- else }}
+  DATABASE_URL: "$(DB_TYPE)://$(DB_USERNAME):$(DB_PASSWORD)@$(DB_HOSTNAME)/$(DB_DATABASE)"
+  DB_USERNAME: {{ .user | quote }}
+  DB_PASSWORD: {{ .password | quote }}
+  DB_HOSTNAME: {{ .host | quote }}
+  DB_DATABASE: {{ .db | quote }}
+  {{- end }}
+{{- end }}
+
+  {{- if .Values.smtp.user }}
+  MAILER_DSN: "$(SMTP_PROTOCOL)://$(SMTP_USERNAME):$(SMTP_PASSWORD)@$(SMTP_HOST):$(SMTP_PORT)"
+  {{- else }}
+  MAILER_DSN: "$(SMTP_PROTOCOL)://$(SMTP_HOST):$(SMTP_PORT)"
+  {{- end }}
+
+{{- with .Values.smtp }}
+  SMTP_HOST: {{ .host | quote }}
+  SMTP_PORT: {{ required "SMTP port value required" .port | quote }}
+  {{- if .user }}
+  SMTP_USERNAME: {{ .user | quote }}
+  SMTP_PASSWORD: {{ .password | quote }}
+  {{- end }}
+{{- end }}
+
+  {{- if .Values.service.LoadBalancerSourceRanges }}
+  TRUSTED_PROXIES: "{{ join "," .Values.service.LoadBalancerSourceRanges }}"
+  {{- end }}

charts/part-db/templates/deployment.yaml

@@ -1,33 +1,38 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: {{ required "A valid .Values.networkPolicyApiVersion entry required!" .Values.networkPolicyApiVersion }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-{{- if .Values.ingress.annotations }}
-  annotations:
-{{ toYaml .Values.ingress.annotations | indent 4 }}
-{{- end }}
-{{- if .Values.ingress.labels }}
-  labels:
-{{ toYaml .Values.ingress.labels | indent 4 }}
-{{- end }}
   name: {{ template "app.fullname" . }}
+  labels: {{ include "app.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-{{- if .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
-{{- end }}
+{{- with .Values.ingress }}
+  {{- if .className }}
+  ingressClassName: {{ .className }}
+  {{- end }}
+  {{- if .tls }}
+  tls:
+    {{- range .tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-  - host: {{ .Values.ingress.hostname | quote }}
+  - host: {{ .hostname | quote }}
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
           service:
-            name: {{ template "app.fullname" . }}
+            name: {{ template "app.fullname" $ }}
             port:
-              number: 80
-        pathType: Prefix  
-{{- if .Values.ingress.tls }}
-  tls:
-{{ toYaml .Values.ingress.tls | indent 4 }}
-{{- end -}}
+              name: http
+{{- end }}
 {{- end }}