lwolf · ribeiromiranda · Jan 15, 2021 · Jan 15, 2021 · Jan 15, 2021
diff --git a/stolon/Chart.yaml b/stolon/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 name: stolon
-version: 0.8.1
-appVersion: 0.13.0
+version: 1.6.5
+appVersion: 0.16.0
+description: Stolon - PostgreSQL cloud native High Availability.
 home: https://github.com/sorintlab/stolon
-description: Stolon Helm Chart for Kubernetes.
 icon: https://i.imgur.com/tIW8sAW.png
 sources:
   - https://github.com/sorintlab/stolon
@@ -13,3 +13,7 @@ maintainers:
     email: ipaq.lw@gmail.com
   - name: Ryan Luckie
     email: rluckie@cisco.com
+sources:
+  - https://github.com/sorintlab/stolon
+  - https://github.com/lwolf/stolon-chart
+engine: gotpl
diff --git a/stolon/README.md b/stolon/README.md
diff --git a/stolon/templates/NOTES.txt b/stolon/templates/NOTES.txt
@@ -1,5 +1,10 @@
-Helm cluster in installed and initialized.
-
+Stolon cluster installed and initialized.
 
+{{ if empty .Values.superuserPasswordFile }}
 To get superuser password run
+{{ if not (empty .Values.superuserSecret.name) }}
+    PGPASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ .Values.superuserSecret.name }} -o jsonpath="{.data.{{.Values.superuserSecret.passwordKey}}}" | base64 --decode; echo)
+{{ else }}
     PGPASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "stolon.fullname" . }} -o jsonpath="{.data.pg_su_password}" | base64 --decode; echo)
+{{ end }}
+{{ end }}
diff --git a/stolon/templates/_helpers.tpl b/stolon/templates/_helpers.tpl
@@ -9,43 +9,28 @@ Expand the name of the chart.
 {{/*
 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 "stolon.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 -}}
-
-{{/*
-Create a default fully qualified store name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "stolon.store.fullname" -}}
-{{- printf "%s-%s" .Release.Name .Values.store.backend | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "stolon.clusterName" -}}
-{{- $genName := printf "%s-%s" .Release.Name .Chart.Name -}}
-{{- $name := default $genName .Values.clusterName -}}
-{{- printf $name -}}
-{{- end -}}
-
-{{- define "stolon.keeper.fullname" -}}
-{{- $serviceName := default "keeper" .Values.keeper.nameOverride -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s-%s" .Release.Name $name $serviceName | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "stolon.sentinel.fullname" -}}
-{{- $serviceName := default "sentinel" .Values.sentinel.nameOverride -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s-%s" .Release.Name $name $serviceName | trunc 63 | trimSuffix "-" -}}
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "stolon.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "stolon.proxy.fullname" -}}
-{{- $serviceName := default "proxy" .Values.proxy.nameOverride -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s-%s" .Release.Name $name $serviceName | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
 
 {{/* Create the name of the service account to use */}}
 {{- define "stolon.serviceAccountName" -}}
@@ -55,3 +40,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{- define "stolon.clusterName" -}}
+{{- if .Values.clusterName -}}
+    {{- .Values.clusterName | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+    {{- template "stolon.fullname" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/stolon/templates/certs.yaml b/stolon/templates/certs.yaml
@@ -0,0 +1,19 @@
+{{ if and (not .Values.tls.existingSecret) ( .Values.tls.enabled) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "stolon.fullname" . }}-certs
+  labels:
+    app: {{ template "stolon.name" . }}
+    chart: {{ template "stolon.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+type: Opaque
+data:
+  rootCa.crt:
+    {{ .Values.tls.rootCa | b64enc | quote }}
+  serverCrt.crt:
+    {{ .Values.tls.serverCrt| b64enc | quote }}
+  serverKey.key:
+    {{ .Values.tls.serverKey | b64enc | quote }}
+{{- end }}
diff --git a/stolon/templates/cluster-create-job.yaml b/stolon/templates/cluster-create-job.yaml
diff --git a/stolon/templates/configmap.yaml b/stolon/templates/configmap.yaml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "stolon.fullname" . }}
+  labels:
+    app: {{ template "stolon.name" . }}
+    chart: {{ template "stolon.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{- if .Values.keeper.hooks.failKeeper.enabled }}
+  pre-stop-hook.sh: |-
+    #!/bin/bash
+    exec &> >(tee -a "/var/log/stolon-hooks.log")
+
+    NODE_NAME=${HOSTNAME}
+    IFS='-' read -ra ADDR <<< "$(hostname)"
+    STKEEPER_UID="{{ .Values.keeper.uid_prefix }}${ADDR[-1]}"
+
+    echo "keeper [${STKEEPER_UID}] is failing"
+    stolonctl \
+      --cluster-name={{ template "stolon.clusterName" . }} \
+      --store-backend={{ .Values.store.backend }} \
+      {{- if eq .Values.store.backend "kubernetes" }}
+      --kube-resource-kind={{ .Values.store.kubeResourceKind }} \
+      {{- else }}
+      --store-endpoints={{ .Values.store.endpoints }} \
+      {{- end }}
+      failkeeper ${STKEEPER_UID} || true
+
+    echo "Node ${NODE_NAME} is ready to shutdown"
+{{- end }}
+{{- with .Values.nodePostStartScript }}
+{{ toYaml . | indent 2 }}
+{{- end }}
diff --git a/stolon/templates/hooks/create-cluster-job.yaml b/stolon/templates/hooks/create-cluster-job.yaml
@@ -0,0 +1,50 @@
+{{ if and .Release.IsInstall .Values.job.autoCreateCluster }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "stolon.fullname" . }}-create-cluster
+  labels:
+    app: {{ template "stolon.name" . }}
+    chart: {{ template "stolon.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  template:
+    metadata:
+      labels:
+        app: {{ template "stolon.fullname" . }}
+        release: {{ .Release.Name }}
+{{- if .Values.job.annotations }}
+      annotations:
+{{ toYaml .Values.job.annotations | indent 8 }}
+{{- end }}
+    spec:
+      restartPolicy: OnFailure
+      serviceAccountName: {{ template "stolon.serviceAccountName" . }}
+  {{- if eq .Values.store.backend "etcdv2" "etcdv3" }}
+      initContainers:
+        - name: {{ .Chart.Name }}-etcd-wait
+          image: "{{ .Values.etcdImage.repository }}:{{ .Values.etcdImage.tag }}"
+          imagePullPolicy: {{ .Values.etcdImage.pullPolicy }}
+          command: ["sh", "-c", "while ! etcdctl --endpoints {{ .Values.store.endpoints }} cluster-health; do sleep 1 && echo -n .; done"]
+  {{- end }}
+      containers:
+        - name: {{ template "stolon.fullname" . }}-create-cluster
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ["/usr/local/bin/stolonctl"]
+          args:
+            - init
+            - --cluster-name={{ template "stolon.clusterName" . }}
+            - --store-backend={{ .Values.store.backend }}
+            {{- if eq .Values.store.backend "kubernetes" }}
+            - --kube-resource-kind={{ .Values.store.kubeResourceKind }}
+            {{- else }}
+            - --store-endpoints={{ .Values.store.endpoints }}
+            {{- end }}
+            - --yes
+            - '{ "initMode": "new", {{- range $key, $value := .Values.clusterSpec }} {{ $key | quote }}: {{ if typeIs "string" $value }} {{ $value | quote }} {{ else }} {{ $value }} {{ end }}, {{- end }} {{ if .Values.tls.enabled }} "pgParameters": {{- $pgParameters := .Values.pgParameters -}}{{ $all_init := set $pgParameters "ssl" "on" }}{{ $all_init := set $all_init "ssl_cert_file" "/certs/serverCrt.crt" }} {{ $all_init := set $all_init "ssl_key_file" "/certs/serverKey.key" }}{{ $all_init := set $all_init "ssl_ca_file" "/certs/rootCa.crt" }}{{ toJson $all_init }}{{ else }}"pgParameters": {{ toJson .Values.pgParameters }} {{ end}} }'
+{{ end }}
diff --git a/stolon/templates/hooks/init-db-job.yaml b/stolon/templates/hooks/init-db-job.yaml
@@ -0,0 +1,76 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "stolon.fullname" . }}-init-scripts
+data:
+{{- with .Values.initdbScripts }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+---
+{{- if .Values.initdbScripts }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: '{{template "stolon.clusterName" .}}-createdb'
+  labels:
+    heritage: {{.Release.Service | quote }}
+    release: {{.Release.Name | quote }}
+    chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-delete-policy": hook-succeeded
+spec:
+  template:
+    metadata:
+      name: "{{.Release.Name}}"
+      labels:
+        heritage: {{.Release.Service | quote }}
+        release: {{.Release.Name | quote }}
+        chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+{{- if .Values.job.annotations }}
+      annotations:
+{{ toYaml .Values.job.annotations | indent 8 }}
+{{- end }}
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: create-database-job
+        image: 'postgres'
+        env:
+          - name: USERNAME
+{{- if not (empty .Values.superuserSecret.name) }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.superuserSecret.name }}
+                key: {{ .Values.superuserSecret.usernameKey }}
+{{- else }}
+            value: {{ .Values.superuserUsername | quote }}
+{{- end }}
+          - name: PGPASSWORD
+{{- if not (empty .Values.superuserSecret.name) }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.superuserSecret.name }}
+                key: {{ .Values.superuserSecret.passwordKey }}
+{{- else }}
+            value: {{ .Values.superuserPassword | quote }}
+{{- end }}
+          - name: HOST
+            value: {{ template "stolon.fullname" . }}-proxy
+        command: ["/bin/bash", "-e", "/tmp/sql-script/create_script.sh"]
+        volumeMounts:
+          - mountPath: "/tmp/sql-script"
+            readOnly: true
+            name: sql-script
+      volumes:
+        - name: sql-script
+          configMap:
+            name: {{ template "stolon.fullname" . }}-init-scripts
+            defaultMode: 420
+      initContainers:
+        - name: wait-for-database
+          image: jwilder/dockerize
+          command: ['dockerize', '-timeout', '30s', '-wait', 'tcp://{{ template "stolon.fullname" . }}-proxy:5432']
+{{- end }}
diff --git a/stolon/templates/hooks/update-cluster-spec-job.yaml b/stolon/templates/hooks/update-cluster-spec-job.yaml
@@ -0,0 +1,50 @@
+{{ if .Values.job.autoUpdateClusterSpec }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "stolon.fullname" . }}-update-cluster-spec
+  labels:
+    app: {{ template "stolon.name" . }}
+    chart: {{ template "stolon.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    "helm.sh/hook": post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  template:
+    metadata:
+      labels:
+        app: {{ template "stolon.fullname" . }}
+        release: {{ .Release.Name }}
+{{- if .Values.job.annotations }}
+      annotations:
+{{ toYaml .Values.job.annotations | indent 8 }}
+{{- end }}
+    spec:
+      restartPolicy: OnFailure
+      serviceAccountName: {{ template "stolon.serviceAccountName" . }}
+  {{- if eq .Values.store.backend "etcdv2" "etcdv3" }}
+      initContainers:
+        - name: {{ .Chart.Name }}-etcd-wait
+          image: "{{ .Values.etcdImage.repository }}:{{ .Values.etcdImage.tag }}"
+          imagePullPolicy: {{ .Values.etcdImage.pullPolicy }}
+          command: ["sh", "-c", "while ! etcdctl --endpoints {{ .Values.store.endpoints }} cluster-health; do sleep 1 && echo -n .; done"]
+  {{- end }}
+      containers:
+        - name: {{ template "stolon.fullname" . }}-update-cluster-spec
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ["/usr/local/bin/stolonctl"]
+          args:
+            - update
+            - --cluster-name={{ template "stolon.clusterName" . }}
+            - --store-backend={{ .Values.store.backend }}
+            {{- if eq .Values.store.backend "kubernetes" }}
+            - --kube-resource-kind={{ .Values.store.kubeResourceKind }}
+            {{- else }}
+            - --store-endpoints={{ .Values.store.endpoints }}
+            {{- end }}
+            - -p
+            - '{ {{- range $key, $value := .Values.clusterSpec }} {{ $key | quote }}: {{ if typeIs "string" $value }} {{ $value | quote }} {{ else }} {{ $value }} {{ end }}, {{- end }} {{ if .Values.tls.enabled }}"pgParameters": {{- $pgParameters := .Values.pgParameters -}}{{ $all := set $pgParameters "ssl" "on" }}{{ $all := set $all "ssl_cert_file" "/certs/serverCrt.crt" }} {{ $all := set $all "ssl_key_file" "/certs/serverKey.key" }}{{ $all := set $all "ssl_ca_file" "/certs/rootCa.crt" }}{{ toJson $all }} {{ else }}"pgParameters": {{- $pgParameters := .Values.pgParameters -}}{{ $all := set $pgParameters "ssl" "off" }}{{ $all := set $all "ssl_cert_file" nil }} {{ $all := set $all "ssl_key_file" nil }}{{ $all := set $all "ssl_ca_file" nil }}{{ toJson $all }}{{ end}}}'
+{{ end }}