add pipeline for helm chart release

.github/workflows/publish-release.yml

@@ -12,6 +12,8 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    permissions:
+      contents: write
     env:
       DOCKER_IMAGE: ghcr.io/nordeck/matrix-poll-widget
     steps:
@@ -59,3 +61,17 @@ jobs:
           tags: ${{ steps.meta-new-tags.outputs.tags }}
           labels: ${{ steps.meta-new-tags.outputs.labels }}
           platforms: linux/amd64,linux/arm64,linux/s390x
+
+      - name: custom packaging
+        run: |
+          VERSION=${{github.ref_name}}
+          rm -rf .cr-release-packages
+          mkdir -p .cr-release-packages
+          helm package charts/matrix-poll-widget --app-version=${VERSION:1} --version=${VERSION:1} --destination=.cr-release-packages
+
+      - name: Run chart-releaser
+        uses: askcloudarchitech/chart-releaser-action@skip-packaging-option
+        with:
+          skip_packaging: true       
+        env:
+          CR_TOKEN: "${{ secrets.TOKEN }}"

charts/matrix-poll-widget/Chart.yaml

@@ -1,7 +1,18 @@
-apiVersion: v2
-name: matrix-poll-widget
+# SPDX-FileCopyrightText: 2023 Nordeck IT + Consulting GmbH"
+# SPDX-License-Identifier: Apache-2.0
+---
+annotations:
+  category: "Security"
+  licenses: "Apache-2.0"
+apiVersion: "v2"
+dependencies:
+  - name: "common"
+    version: "^2.x.x"
+    repository: "https://charts.bitnami.com/bitnami"
 description: A poll widget for Matrix
+home: https://github.com/nordeck/matrix-poll
+name: matrix-poll-widget
 type: application
 version: 0.1.0
 appVersion: "0.0.0"
-home: https://github.com/nordeck/matrix-poll
+

charts/matrix-poll-widget/templates/configmap.yaml

@@ -1,10 +1,20 @@
+{{/*
+SPDX-FileCopyrightText: 2023 Nordeck IT & Consulting GmbH"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "app.fullname" . }}-cm
+  name: "{{ include "common.names.fullname" . }}"
   labels:
-{{ include "app.labels" . | indent 4 }}
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 data:
-  REACT_APP_HOME_SERVER_URL: "https://synapse.{{- .Values.settings.hostname -}}"
+  REACT_APP_HOME_SERVER_URL: "https://synapse.{{- .Values.global.domain -}}"
   REACT_APP_POLL_DESCRIPTION_REQUIRED: "true"
   REACT_APP_POLL_SHOW_LIVE_RESULT_BY_NAME: "true"

charts/matrix-poll-widget/templates/deployment.yaml

@@ -1,38 +1,74 @@
-apiVersion: apps/v1
-kind: Deployment
+{{/*
+SPDX-FileCopyrightText: 2023 Nordeck IT & Consulting GmbH"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+
+apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
+kind: "Deployment"
 metadata:
-  name: {{ include "app.fullname" . }}
-  labels:
-{{ include "app.labels" . | indent 4 }}
+  name: {{ include "common.names.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: "matrix-poll-widget"
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
-  {{- end }}
   selector:
     matchLabels:
-      {{- include "app.selectorLabels" . | nindent 6 }}
+      {{- include "common.labels.matchLabels" . | nindent 6 }}
+  strategy: {{ include "common.tplvalues.render" (dict "value" .Values.updateStrategy "context" $) | nindent 4 }}
   template:
     metadata:
       annotations:
-        checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
+        checksum/configmap: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- if .Values.podAnnotations }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
       labels:
-        {{- include "app.selectorLabels" . | nindent 8 }}
+        {{- include "common.labels.standard" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
+      {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+        {{- range .Values.global.imagePullSecrets }}
+        - name: "{{ . }}"
+        {{- end }}
+        {{- range .Values.imagePullSecrets }}
+        - name: "{{ . }}"
+        {{- end }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceAccount.create }}
+      serviceAccountName: {{ include "common.names.fullname" . }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
-      serviceAccountName: {{ include "app.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+
       containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        - name: "matrix-poll-widget"
+          {{- if .Values.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          image: "{{ coalesce .Values.image.registry .Values.global.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
@@ -56,7 +92,7 @@ spec:
             {{- end }}
           envFrom:
           - configMapRef:
-              name: {{ include "app.fullname" . }}-cm
+              name: {{ include "common.names.fullname" . }}
           volumeMounts:
           - name: cache-volume
             mountPath: /var/cache/nginx

charts/matrix-poll-widget/templates/hpa.yaml

@@ -1,3 +1,7 @@
+{{/*
+SPDX-FileCopyrightText: 2023 Nordeck IT & Consulting GmbH"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 {{- if .Values.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler

charts/matrix-poll-widget/templates/ingress.yaml

@@ -1,44 +1,37 @@
+{{/*
+SPDX-FileCopyrightText: 2023 Nordeck IT & Consulting GmbH"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "app.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
+---
+apiVersion: "{{ include "common.capabilities.ingress.apiVersion" . }}"
+kind: "Ingress"
 metadata:
-  name: "{{ $fullName }}"
+  name: "{{ include "common.names.fullname" . }}"
   labels:
-    {{- include "app.labels" . | nindent 4 }}
+    {{- include "common.labels.standard" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
+  {{- if .Values.ingress.tls.enabled }}
+  tls:
+    - hosts:
+        - {{ coalesce .Values.ingress.host (printf "%s.%s" .Values.global.hosts.matrixpollwidget .Values.global.domain) | quote }}
+      secretName: "{{ .Values.ingress.tls.secretName | default (printf "%s-tls" (include "common.labels.standard" . )) }}"
   {{- end }}
   rules:
-    - host: "{{- $fullName -}}.{{- .Values.settings.hostname -}}"
+    - host: {{ coalesce .Values.ingress.host (printf "%s.%s" .Values.global.hosts.matrixpollwidget .Values.global.domain) | quote }}
       http:
         paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-  tls:
-    - hosts:
-      - "{{- $fullName -}}.{{- .Values.settings.hostname -}}"
-      secretName: "{{- $fullName -}}.{{- .Release.Namespace -}}-tls"
+          - path: {{ .Values.ingress.path }}
+            {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
+            pathType: {{ .Values.ingress.pathType }}
+            {{- end }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" 8080 "context" $) | nindent 14 }}
+...
 {{- end }}

charts/matrix-poll-widget/templates/service.yaml

@@ -1,15 +1,42 @@
-apiVersion: v1
-kind: Service
+{{/*
+SPDX-FileCopyrightText: Nordeck IT + Consulting GmbH"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if .Values.service.enabled }}
+---
+apiVersion: "v1"
+kind: "Service"
 metadata:
-  name: {{ include "app.fullname" . }}
+  name: "{{ include "common.names.fullname" . }}"
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
-{{ include "app.labels" . | indent 4 }}
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if or .Values.service.annotations .Values.commonAnnotations }}
+  annotations:
+    {{- if .Values.service.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }}
+    {{- end }}
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- end }}
 spec:
-  type: {{ .Values.service.type }}
+  type: "{{ .Values.service.type }}"
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
+    {{- range $key, $value := .Values.service.ports }}
+    - name: "{{ $key }}"
+      port: {{ $value.port }}
+      targetPort: {{ $value.port }}
+      protocol: "{{ $value.protocol | default "TCP" }}"
+      {{- if and $value.nodePort (not (eq $.Values.service.type "ClusterIP")) }}
+      nodePort: {{ $value.nodePort }}
+      {{- end }}
+    {{- end }}
   selector:
-    {{- include "app.selectorLabels" . | nindent 4 }}
+    {{- include "common.labels.matchLabels" . | nindent 4 }}
+...
+{{- end }}
+