improve helm

helm/Chart.yaml

@@ -1,24 +1,22 @@
 apiVersion: v2
+type: application
+
 name: squidex
-description: A Helm chart for Kubernetes
+description: Squidex CMS
 
-# A chart can be either an 'application' or a 'library' chart.
+version: 1.0.0
-#
+appVersion: "5.7.0"
-# Application charts are a collection of templates that can be packaged into versioned archives
+
-# to be deployed.
+home: https://squidex.io/
-#
+
-# Library charts provide useful utilities or functions for the chart developer. They're included as
+keywords:
-# a dependency of application charts to inject those utilities and functions into the rendering
+  - cms
-# 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
+sources:
-# to the chart and its templates, including the app version.
+  - https://github.com/Squidex/squidex
-# 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
+dependencies:
-# incremented each time you make changes to the application. Versions are not expected to
+  - name: mongodb-replicaset
-# follow Semantic Versioning. They should reflect the version the application is using.
+    version: 3.9.6
-# It is recommended to use it with quotes.
+    repository: https://kubernetes-charts.storage.googleapis.com/
-appVersion: "1.16.0"
+    condition: mongodb-replicaset.enabled

helm/templates/NOTES.txt

@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "squidex.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "squidex.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "squidex.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "squidex.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}

helm/templates/_helpers.tpl

@@ -1,62 +1,73 @@
-{{/*
+{{/* vim: set filetype=mustache: */}}
-Expand the name of the chart.
-*/}}
-{{- define "squidex.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
 
-{{/*
+{{- define "squidex.selectors" }}
-Create a default fully qualified app name.
+{{- if .Values.selectors.component }}
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+app.kubernetes.io/component: {{ .Values.selectors.component }}
-If release name contains chart name it will be used as a full name.
+{{- end}}
-*/}}
+app.kubernetes.io/name: {{ include "squidex.name" . }}
-{{- define "squidex.fullname" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}  
-{{- if .Values.fullnameOverride }}
+{{- if .Values.selectors.partOf }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+app.kubernetes.io/part-of: {{ .Values.selectors.partOf }}
-{{- 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 }}
+{{- if .Values.selectors.version }}
+app.kubernetes.io/version: {{ .Values.selectors.version | quote }}
+{{- end -}}
+{{- end -}}
+
+{{- define "squidex.labels" }}
+{{- include "squidex.selectors" . }}
+helm.sh/chart: {{ include "squidex.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.labels }}
+{{- toYaml .Values.labels | nindent 4 }}
+{{- end -}}
+{{- end -}}
+
+{{- define "squidex.mongoDefaultHostname" }}
+  {{- $release := .Release}}
+  {{- $clusterSuffix := .Values.clusterSuffix}}
+  {{- range $index, $i := until (int (index .Values "mongodb-replicaset").replicas) }}
+    {{- $replica := printf "%s-mongodb-replicaset-%d.%s-mongodb-replicaset.%s.svc.%s" $release.Name $i $release.Name $release.Namespace $clusterSuffix }}
+    {{- if eq $i 0}}
+      {{- $replica }}
+    {{- else -}}
+      ,{{ $replica }}
+    {{- end }}
+  {{- end }}
 {{- end }}
+
+{{- define "squidex.internalDnsName" }}
+  {{- .Release.Name }}-
+  {{- include "squidex.name" . }}.
+  {{- .Release.Namespace }}.svc.
+  {{- .Values.clusterSuffix}}
 {{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
 {{- define "squidex.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end }}
+{{- end -}}
 
-{{/*
+{{- define "squidex.name" -}}
-Common labels
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-*/}}
+{{- end -}}
-{{- define "squidex.labels" -}}
-helm.sh/chart: {{ include "squidex.chart" . }}
-{{ include "squidex.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "squidex.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "squidex.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
 
 {{/*
-Create the name of the service account to use
+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 "squidex.serviceAccountName" -}}
+{{- define "squidex.fullname" -}}
-{{- if .Values.serviceAccount.create }}
+{{- if .Values.fullnameOverride -}}
-{{- default (include "squidex.fullname" .) .Values.serviceAccount.name }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else }}
+{{- else -}}
-{{- default "default" .Values.serviceAccount.name }}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- end }}
+{{- if contains $name .Release.Name -}}
-{{- end }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}

helm/templates/deployment.yaml

@@ -3,59 +3,65 @@ kind: Deployment
 metadata:
   name: {{ include "squidex.fullname" . }}
   labels:
-    {{- include "squidex.labels" . | nindent 4 }}
+    {{- include "squidex.labels" . | indent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.deployment.replicaCount }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
   selector:
     matchLabels:
-      {{- include "squidex.selectorLabels" . | nindent 6 }}
+      {{- include "squidex.selectors" . | indent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       labels:
-        {{- include "squidex.selectorLabels" . | nindent 8 }}
+        {{- include "squidex.selectors" . | indent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "squidex.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
-          securityContext:
+          image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
               containerPort: 80
               protocol: TCP
+            - name: orleans
+              containerPort: 11111
+              protocol: TCP
           livenessProbe:
             httpGet:
-              path: /
+              path: /healthz
               port: http
           readinessProbe:
             httpGet:
-              path: /
+              path: /readiness
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
+          env:
-      nodeSelector:
+          {{- range $key, $val := .Values.env }}
-        {{- toYaml . | nindent 8 }}
+            {{- if (eq $key "URLS__BASEURL") }}
+            - name: {{ $key | quote }}
+              value: {{ required (printf "The value .Values.env.%s is required" $key) $val | quote }}
+            {{- else }}
+            - name: {{ $key | quote }}
+              value: {{ $val | quote }}
             {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
           {{- end }}
-      {{- with .Values.tolerations }}
+          
-      tolerations:
+          {{- $mongoDefaultConnectionString := printf "mongodb://%s" (include "squidex.mongoDefaultHostname" .) }}
-        {{- toYaml . | nindent 8 }}
+          {{- if (not .Values.env.EVENTSTORE__MONGODB__CONFIGURATION) }}
+            - name: "EVENTSTORE__MONGODB__CONFIGURATION"
+              value: {{ $mongoDefaultConnectionString | quote }}
+          {{- end }}
+          {{- if (not .Values.env.STORE__MONGODB__CONFIGURATION) }}
+            - name: "STORE__MONGODB__CONFIGURATION"
+              value: {{ $mongoDefaultConnectionString | quote }}
           {{- end }}
+      nodeSelector:
+        {{- toYaml .Values.nodeSelector | nindent 8 }}
+      affinity:
+        {{- toYaml .Values.affinity | nindent 8 }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}

helm/templates/hpa.yaml

@@ -1,28 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "squidex.fullname" . }}
-  labels:
-    {{- include "squidex.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "squidex.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 }}

helm/templates/ingress.yaml

@@ -1,32 +1,17 @@
-{{- if .Values.ingress.enabled -}}
 {{- $fullName := include "squidex.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
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
-    {{- include "squidex.labels" . | nindent 4 }}
+    {{- include "squidex.labels" . | indent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+{{- if .Values.ingress.tls }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}
     - hosts:
@@ -35,27 +20,15 @@ spec:
       {{- end }}
       secretName: {{ .secretName }}
   {{- end }}
-  {{- end }}
+{{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
+    - host: {{ .Values.ingress.hostName | quote }}
-    - host: {{ .host | quote }}
       http:
         paths:
-          {{- range .paths }}
+          - path: /
-          - path: {{ .path }}
+            pathType: Prefix
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
-                  number: {{ $svcPort }}
+                  number: {{ .Values.service.port }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}

helm/templates/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ include "squidex.fullname" . }}
   labels:
-    {{- include "squidex.labels" . | nindent 4 }}
+    {{- include "squidex.labels" . | indent 4 }}  
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "squidex.selectorLabels" . | nindent 4 }}
+    {{- include "squidex.selectors" . | indent 4 }}

helm/templates/serviceaccount.yaml

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

helm/templates/tests/test-connection.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "squidex.fullname" . }}-test-connection"
-  labels:
-    {{- include "squidex.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "squidex.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never

helm/values.yaml

@@ -1,82 +1,60 @@
-# Default values for squidex.
+labels:
-# This is a YAML-formatted file.
+service:
-# Declare variables to be passed into your templates.
+  type: ClusterIP
-
+  port: 80
-replicaCount: 1
+deployment:
-
+  replicaCount: 1
+selectors:
+  component: squidex
+  partOf: ""
+  version: ""
 image:
   repository: squidex/squidex
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
   tag: ""
+  pullPolicy: IfNotPresent
 
-imagePullSecrets: []
+resources: { }
-nameOverride: ""
+nodeSelector: { }
-fullnameOverride: ""
+tolerations: [ ]
-
+affinity: { }
-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: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
-service:
+clusterSuffix: cluster.local
-  type: ClusterIP
-  port: 80
 
 ingress:
-  enabled: false
+  annotations: { }
-  className: ""
-  annotations: {}
   # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"
-  hosts:
+  hostName: squidex.local
-    - host: chart-example.local
+
-      paths:
+  tls: [ ]
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
 
-resources: {}
+env:
-  # We usually recommend not to specify default resources and to leave this as a conscious
+  URLS__BASEURL: null
-  # choice for the user. This also increases chances charts run on environments with little
+  URLS__ENFORCEHTTPS: false
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  EVENTSTORE__CONSUME: true
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  EVENTSTORE__TYPE: MongoDb
-  # limits:
+  IDENTITY__ADMINEMAIL: null
-  #   cpu: 100m
+  IDENTITY__ADMINPASSWORD: null
-  #   memory: 128Mi
+  IDENTITY__SHOWPII: true
-  # requests:
+  LETSENCRYPT_HOST: null
-  #   cpu: 100m
+  LETSENCRYPT_EMAIL: null
-  #   memory: 128Mi
+  LOGGING__HUMAN: "false"
-
+  EVENTSTORE__MONGODB__DATABASE: "Squidex"
-autoscaling:
+  STORE__MONGODB__DATABASE: "Squidex"
-  enabled: false
+  STORE__MONGODB__CONTENTDATABASE: "SquidexContent"
-  minReplicas: 1
+  IDENTITY__GOOGLECLIENT: null
-  maxReplicas: 100
+  IDENTITY__GOOGLESECRET: null
-  targetCPUUtilizationPercentage: 80
+  IDENTITY__MICROSOFTCLIENT: null
-  # targetMemoryUtilizationPercentage: 80
+  IDENTITY__MICROSOFTSECRET: null
-
+  IDENTITY__GITHUBCLIENT: null
-nodeSelector: {}
+  IDENTITY__GITHUBSECRET: null
-
+  IDENTITY__ALLOWPASSWORDAUTH: "true"
-tolerations: []
+  IDENTITY__LOCKAUTOMATICALLY: "false"
-
+  ORLEANS__CLUSTERING: MongoDB
-affinity: {}
+
+mongodb-replicaset:
+  enabled: true
+  replicas: 3