Merge 4320a92 into 5ecd3d5

cinaq · Nov 20, 2022 · 4ae786a · 4ae786a
2 parents 5ecd3d5 + 4320a92
commit 4ae786a
Show file tree

Hide file tree

Showing 11 changed files with 361 additions and 399 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  pull_request:
 
 jobs:
   release:

diff --git a/charts/app-mendix/Chart.yaml b/charts/app-mendix/Chart.yaml
@@ -1,6 +1,6 @@
-apiVersion: v1
+apiVersion: v2
 name: app-mendix
-version: 1.0.8
+version: 2.0.2
 description: Mendix Application Chart.
 icon: https://cinaq.github.io/helm-charts/icons/mendix-logo.png
 maintainers:

diff --git a/charts/app-mendix/templates/_helpers.tpl b/charts/app-mendix/templates/_helpers.tpl
@@ -2,15 +2,42 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "app-mendix.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).
 */}}
-{{- define "fullname" -}}
+{{- define "app-mendix.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "app-mendix.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "app-mendix.labels" -}}
+helm.sh/chart: {{ include "app-mendix.chart" . }}
+{{ include "app-mendix.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "app-mendix.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "app-mendix.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/charts/app-mendix/templates/autoscale.yaml b/charts/app-mendix/templates/autoscale.yaml
@@ -1,19 +1,16 @@
 {{- if .Values.autoscale.enabled -}}
-{{- $serviceName := include "fullname" . -}}
+{{- $serviceName := include "app-mendix.fullname" . -}}
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "app-mendix.fullname" . }}
   labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "app-mendix.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ template "fullname" . }}-slave
+    name: {{ template "app-mendix.fullname" . }}-slave
   minReplicas: {{ .Values.autoscale.minSlaveReplicas }}
   maxReplicas: {{ .Values.autoscale.maxSlaveReplicas }}
   targetCPUUtilizationPercentage: {{ .Values.autoscale.targetCPUUtilizationPercentage }}

diff --git a/charts/app-mendix/templates/deployment-leader.yaml b/charts/app-mendix/templates/deployment-leader.yaml
@@ -0,0 +1,117 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "app-mendix.fullname" . }}-leader
+  labels:
+    {{- include "app-mendix.labels" . | nindent 4 }}
+spec:
+{{- if ge .Values.replicaCount 1.0 }}
+  replicas: 1
+{{- else }}
+  replicas: 0
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "app-mendix.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "app-mendix.labels" . | nindent 8 }}
+      {{- with .Values.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.service.internalPort }}
+            {{- if .Values.metrics.enabled }}
+            - containerPort: {{ add .Values.service.internalPort 3}}
+              name: metrics
+            {{- end }}
+          env:
+            - name: CF_INSTANCE_INDEX
+              value: "0"
+          {{- range .Values.env }}
+            - name: {{ .name | quote}}
+              value: {{ .value | quote}}
+          {{- end }}
+          {{- if .Values.secretName }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.secretName }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            {{- if eq "httpGet" .Values.readinessProbe.type }}
+            httpGet:
+              path: {{ .Values.readinessProbe.httpGet.path }}
+              port: {{ .Values.readinessProbe.httpGet.port }}
+            {{- else if eq "exec" .Values.readinessProbe.type }}
+            exec:
+              command:
+              {{- range .Values.readinessProbe.exec.command }}
+              - {{ . }}
+              {{- end }}
+            {{- else if eq "tcpSocket" .Values.readinessProbe.type }}
+            tcpSocket:
+              port: {{ .Values.readinessProbe.tcpSocket.port }}
+            {{- end }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            {{- if eq "httpGet" .Values.livenessProbe.type }}
+            httpGet:
+              path: {{ .Values.livenessProbe.httpGet.path }}
+              port: {{ .Values.livenessProbe.httpGet.port }}
+            {{- else if eq "exec" .Values.livenessProbe.type }}
+            exec:
+              command:
+              {{- range .Values.livenessProbe.exec.command }}
+              - {{ . }}
+              {{- end }}
+            {{- else if eq "tcpSocket" .Values.livenessProbe.type }}
+            tcpSocket:
+              port: {{ .Values.livenessProbe.tcpSocket.port }}
+            {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.lifecycle.prestop.enabled }}
+          lifecycle:
+            preStop:
+              exec:
+                command: [{{ .Values.lifecycle.prestop.command }}]
+          {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/app-mendix/templates/deployment-slave.yaml b/charts/app-mendix/templates/deployment-slave.yaml
@@ -0,0 +1,123 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "app-mendix.fullname" . }}-slave
+  labels:
+    {{- include "app-mendix.labels" . | nindent 4 }}
+spec:
+{{- if .Values.autoscale.enabled }}
+  replicas: {{ .Values.autoscale.minSlaveReplicas }}
+{{- else }}
+  replicas: {{ sub .Values.replicaCount 1.0 }}
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "app-mendix.selectorLabels" . | nindent 6 }}
+  {{- if .Values.strategy.enabled }}
+  strategy:
+    type: {{ .Values.strategy.type }}
+    {{- if eq "RollingUpdate" .Values.strategy.type }}
+    rollingUpdate:
+      maxSurge: {{ .Values.strategy.rollingUpdate.maxSurge }}
+      maxUnavailable: {{ .Values.strategy.rollingUpdate.maxUnavailable }}
+    {{- end }}
+  {{- end }}
+  template:
+    metadata:
+      labels:
+        {{- include "app-mendix.labels" . | nindent 8 }}
+      {{- with .Values.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.service.internalPort }}
+            {{- if .Values.metrics.enabled }}
+            - containerPort: {{ add .Values.service.internalPort 3 }}
+            {{- end }}
+          env:
+            - name: CF_INSTANCE_INDEX
+              value: "1"
+          {{- range .Values.env }}
+            - name: {{ .name | quote}}
+              value: {{ .value | quote}}
+          {{- end }}
+          {{- if .Values.secretName }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.secretName }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            {{- if eq "httpGet" .Values.readinessProbe.type }}
+            httpGet:
+              path: {{ .Values.readinessProbe.httpGet.path }}
+              port: {{ .Values.readinessProbe.httpGet.port }}
+            {{- else if eq "exec" .Values.readinessProbe.type }}
+            exec:
+              command:
+              {{- range .Values.readinessProbe.exec.command }}
+              - {{ . }}
+              {{- end }}
+            {{- else if eq "tcpSocket" .Values.readinessProbe.type }}
+            tcpSocket:
+              port: {{ .Values.readinessProbe.tcpSocket.port }}
+            {{- end }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            {{- if eq "httpGet" .Values.livenessProbe.type }}
+            httpGet:
+              path: {{ .Values.livenessProbe.httpGet.path }}
+              port: {{ .Values.livenessProbe.httpGet.port }}
+            {{- else if eq "exec" .Values.livenessProbe.type }}
+            exec:
+              command:
+              {{- range .Values.livenessProbe.exec.command }}
+              - {{ . }}
+              {{- end }}
+            {{- else if eq "tcpSocket" .Values.livenessProbe.type }}
+            tcpSocket:
+              port: {{ .Values.livenessProbe.tcpSocket.port }}
+            {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.lifecycle.prestop.enabled }}
+          lifecycle:
+            preStop:
+              exec:
+                command: [{{ .Values.lifecycle.prestop.command }}]
+          {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - main
+      pull_request:
     jobs:
       release:
@@ Expand Down @@