Browse Source

improve helm

pull/731/head
Kamus Hadenes 5 years ago
parent
commit
84dcdf90c0
No known key found for this signature in database GPG Key ID: EE8A46B3A80AFD59
  1. 36
      helm/Chart.yaml
  2. BIN
      helm/charts/mongodb-replicaset-3.9.6.tgz
  3. 22
      helm/templates/NOTES.txt
  4. 107
      helm/templates/_helpers.tpl
  5. 60
      helm/templates/deployment.yaml
  6. 28
      helm/templates/hpa.yaml
  7. 39
      helm/templates/ingress.yaml
  8. 4
      helm/templates/service.yaml
  9. 12
      helm/templates/serviceaccount.yaml
  10. 15
      helm/templates/tests/test-connection.yaml
  11. 110
      helm/values.yaml

36
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.
#
# 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
version: 1.0.0
appVersion: "5.7.0"
home: https://squidex.io/
keywords:
- cms
# 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
sources:
- https://github.com/Squidex/squidex
# 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"
dependencies:
- name: mongodb-replicaset
version: 3.9.6
repository: https://kubernetes-charts.storage.googleapis.com/
condition: mongodb-replicaset.enabled

BIN
helm/charts/mongodb-replicaset-3.9.6.tgz

Binary file not shown.

22
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 }}

107
helm/templates/_helpers.tpl

@ -1,62 +1,73 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "squidex.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{/* vim: set filetype=mustache: */}}
{{- define "squidex.selectors" }}
{{- if .Values.selectors.component }}
app.kubernetes.io/component: {{ .Values.selectors.component }}
{{- end}}
app.kubernetes.io/name: {{ include "squidex.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.selectors.partOf }}
app.kubernetes.io/part-of: {{ .Values.selectors.partOf }}
{{- end }}
{{- if .Values.selectors.version }}
app.kubernetes.io/version: {{ .Values.selectors.version | quote }}
{{- end -}}
{{- 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 "squidex.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 "-" }}
{{- 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 }}
{{/*
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 "-" }}
{{- define "squidex.internalDnsName" }}
{{- .Release.Name }}-
{{- include "squidex.name" . }}.
{{- .Release.Namespace }}.svc.
{{- .Values.clusterSuffix}}
{{- end }}
{{/*
Common labels
Create chart name and version as used by the chart label.
*/}}
{{- 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 }}
{{- define "squidex.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "squidex.selectorLabels" -}}
app.kubernetes.io/name: {{ include "squidex.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{- define "squidex.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- 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" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "squidex.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}
{{- define "squidex.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 -}}

60
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.replicaCount }}
{{- end }}
replicas: {{ .Values.deployment.replicaCount }}
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:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
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 }}
nodeSelector:
{{- toYaml . | nindent 8 }}
env:
{{- range $key, $val := .Values.env }}
{{- 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:
{{- toYaml . | nindent 8 }}
{{- $mongoDefaultConnectionString := printf "mongodb://%s" (include "squidex.mongoDefaultHostname" .) }}
{{- 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 }}

28
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 }}

39
helm/templates/ingress.yaml

@ -1,31 +1,16 @@
{{- 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) }}
ingressClassName: {{ .Values.ingress.className }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
@ -37,25 +22,13 @@ spec:
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
- host: {{ .Values.ingress.hostName | quote }}
http:
paths:
{{- range .paths }}
- path: {{ .path }}
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: {{ .pathType }}
{{- end }}
- path: /
pathType: Prefix
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
number: {{ .Values.service.port }}

4
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 }}

12
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 }}

15
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

110
helm/values.yaml

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