From 4fb4a31487dfe5b0af7a239060271b2f1191c3ff Mon Sep 17 00:00:00 2001
From: groundhog2k <10630407+groundhog2k@users.noreply.github.com>
Date: Mon, 25 Jan 2021 18:47:50 +0100
Subject: [PATCH] Fixed issues #192, #169 for commento chart (#204)
---
charts/commento/Chart.lock | 6 +--
charts/commento/Chart.yaml | 6 +--
charts/commento/README.md | 7 ++-
charts/commento/charts/postgres-0.2.5.tgz | Bin 5017 -> 0 bytes
charts/commento/charts/postgres-0.2.7.tgz | Bin 0 -> 5462 bytes
charts/commento/templates/_helpers.tpl | 24 +++++++++++
charts/commento/templates/deployment.yaml | 26 +++++++----
charts/commento/templates/secrets.yaml | 45 --------------------
charts/commento/templates/secureconfig.yaml | 42 ++++++++++++++++++
charts/commento/values.yaml | 9 ++++
10 files changed, 103 insertions(+), 62 deletions(-)
delete mode 100644 charts/commento/charts/postgres-0.2.5.tgz
create mode 100644 charts/commento/charts/postgres-0.2.7.tgz
delete mode 100644 charts/commento/templates/secrets.yaml
create mode 100644 charts/commento/templates/secureconfig.yaml
diff --git a/charts/commento/Chart.lock b/charts/commento/Chart.lock
index 2741169d..9492e2a0 100644
--- a/charts/commento/Chart.lock
+++ b/charts/commento/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: postgres
repository: https://groundhog2k.github.io/helm-charts
- version: 0.2.5
-digest: sha256:1cbaca2458607369da14b57021d4823a56eed2c4a57226780abee2c7ebb4769b
-generated: "2020-12-14T23:11:24.611033+01:00"
+ version: 0.2.7
+digest: sha256:97ed1617bdb942a568743f608d7bbb9a6a9cd77278e6283670c1ab54b828d4fb
+generated: "2021-01-24T18:56:05.9746959+01:00"
diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index e588bde5..e3ea676a 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,12 +7,12 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.1.9
+version: 0.1.10
-appVersion: v1.8.0
+appVersion: "v1.8.0"
dependencies:
- name: postgres
- version: 0.2.5
+ version: 0.2.7
repository: "https://groundhog2k.github.io/helm-charts"
condition: postgres.enabled
diff --git a/charts/commento/README.md b/charts/commento/README.md
index 433f89b4..2855311f 100644
--- a/charts/commento/README.md
+++ b/charts/commento/README.md
@@ -1,6 +1,6 @@
# Commento
-  
+  
A Helm chart for Commento on Kubernetes
@@ -45,7 +45,7 @@ $ helm uninstall my-release
| Repository | Name | Version |
|------------|------|---------|
-| @groundhog2k | postgres | 0.2.5 |
+| @groundhog2k | postgres | 0.2.7 |
## Common parameters
@@ -62,8 +62,11 @@ $ helm uninstall my-release
| image.repository | string | `"registry.gitlab.com/commento/commento"` | Image name |
| image.tag | string | `""` | Image tag |
| imagePullSecrets | list | `[]` | Image pull secrets |
+| strategy | object | `{}` | Pod deployment strategy |
| livenessProbe | object | `see values.yaml` | Liveness probe configuration |
| readinessProbe | object | `see values.yaml` | Readiness probe configuration |
+| customLivenessProbe | object | `{}` | Custom liveness probe (overwrites default liveness probe configuration) |
+| customReadinessProbe | object | `{}` | Custom readiness probe (overwrites default readiness probe configuration) |
| resources | object | `{}` | Resource limits and requests |
| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | Deployment node selector |
| podAnnotations | object | `{}` | Additional pod annotations |
diff --git a/charts/commento/charts/postgres-0.2.5.tgz b/charts/commento/charts/postgres-0.2.5.tgz
deleted file mode 100644
index c2b41d43ffbc183aa96b8e09f0f01cfb08498002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5017
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
diff --git a/charts/commento/charts/postgres-0.2.7.tgz b/charts/commento/charts/postgres-0.2.7.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a8a63a1a22cfb6b9817154979215a15069d38d84
GIT binary patch
literal 5462
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
literal 0
HcmV?d00001
diff --git a/charts/commento/templates/_helpers.tpl b/charts/commento/templates/_helpers.tpl
index 4f67e5b7..c4057025 100644
--- a/charts/commento/templates/_helpers.tpl
+++ b/charts/commento/templates/_helpers.tpl
@@ -73,3 +73,27 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}
+
+{{/*
+Commento settings via environment variables
+*/}}
+{{- define "commento.environment" -}}
+- name: COMMENTO_FORBID_NEW_OWNERS
+ value: {{ .Values.settings.forbidNewOwners | quote }}
+- name: COMMENTO_GZIP_STATIC
+ value: {{ .Values.settings.gzipStaticContent | quote }}
+- name: COMMENTO_PORT
+ value: {{ .Values.containerPort | quote }}
+- name: COMMENTO_ORIGIN
+ value: {{ (printf "%s://%s" .Values.settings.protocol .Values.ingress.host) | quote }}
+{{- with .Values.settings.smtp }}
+ {{- if .enabled }}
+ - name: COMMENTO_SMTP_HOST
+ value: {{ .host | quote }}
+ - name: COMMENTO_SMTP_PORT
+ value: {{ .port | quote }}
+ - name: COMMENTO_SMTP_FROM_ADDRESS
+ value: {{ .from | quote }}
+ {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/commento/templates/deployment.yaml b/charts/commento/templates/deployment.yaml
index cea43222..6ceedef8 100644
--- a/charts/commento/templates/deployment.yaml
+++ b/charts/commento/templates/deployment.yaml
@@ -9,10 +9,15 @@ spec:
selector:
matchLabels:
{{- include "commento.selectorLabels" . | nindent 6 }}
+ {{- with .Values.strategy }}
+ strategy:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
template:
metadata:
- {{- with .Values.podAnnotations }}
annotations:
+ checksum/secureconfig: {{ include (print $.Template.BasePath "/secureconfig.yaml") . | sha256sum }}
+ {{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
@@ -47,6 +52,10 @@ spec:
httpHeaders:
- name: Host
value: localhost:{{ .Values.containerPort }}
+ {{- if .Values.customLivenessProbe }}
+ livenessProbe:
+ {{- toYaml .Values.customLivenessProbe | nindent 12 }}
+ {{- else }}
{{- with .Values.livenessProbe }}
initialDelaySeconds: {{ .initialDelaySeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
@@ -55,6 +64,11 @@ spec:
periodSeconds: {{ .periodSeconds }}
{{- end }}
{{- end }}
+ {{- end }}
+ {{- if .Values.customReadinessProbe }}
+ readinessProbe:
+ {{- toYaml .Values.customReadinessProbe | nindent 12 }}
+ {{- else }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
httpGet:
@@ -71,6 +85,7 @@ spec:
periodSeconds: {{ .periodSeconds }}
{{- end }}
{{- end }}
+ {{- end }}
{{- with .Values.resources }}
resources:
{{- toYaml . | nindent 12 }}
@@ -79,14 +94,7 @@ spec:
- secretRef:
name: {{ include "commento.fullname" . }}
env:
- - name: COMMENTO_FORBID_NEW_OWNERS
- value: {{ .Values.settings.forbidNewOwners | quote }}
- - name: COMMENTO_GZIP_STATIC
- value: {{ .Values.settings.gzipStaticContent |quote }}
- - name: COMMENTO_PORT
- value: {{ .Values.containerPort | quote }}
- - name: COMMENTO_ORIGIN
- value: {{ .Values.settings.protocol }}://{{ .Values.ingress.host }}
+ {{- include "commento.environment" . | nindent 12 }}
{{- with .Values.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
diff --git a/charts/commento/templates/secrets.yaml b/charts/commento/templates/secrets.yaml
deleted file mode 100644
index 94ba6d04..00000000
--- a/charts/commento/templates/secrets.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ include "commento.fullname" . }}
- labels:
- {{- include "commento.labels" . | nindent 4 }}
-type: Opaque
-stringData:
-{{- if .Values.postgres.enabled }}
- COMMENTO_POSTGRES: postgres://{{ .Values.postgres.userDatabase.user }}:{{ .Values.postgres.userDatabase.password }}@{{ include "postgres.servicename" . }}:{{ .Values.postgres.service.port }}/{{ .Values.postgres.userDatabase.name }}?sslmode=disable
-{{- else }}
-{{- with .Values.externalDatabase }}
- COMMENTO_POSTGRES: postgres://{{ .user }}:{{ .password }}@{{ .host }}:{{ .port }}/{{ .name }}?sslmode=disable
-{{- end }}
-{{- end }}
-{{- with .Values.settings.smtp }}
- {{- if .enabled }}
- COMMENTO_SMTP_HOST: {{ .host }}
- COMMENTO_SMTP_PORT: {{ .port | quote }}
- COMMENTO_SMTP_USERNAME: {{ .name }}
- COMMENTO_SMTP_PASSWORD: {{ .password | quote }}
- COMMENTO_SMTP_FROM_ADDRESS: {{ .from }}
- {{- end }}
-{{- end }}
-{{- if .Values.settings.akismetKey }}
- COMMENTO_AKISMET_KEY: {{ .Values.settings.akismetKey | quote }}
-{{- end }}
-{{- with .Values.settings.oauth }}
- {{- if .google.enabled }}
- COMMENTO_GOOGLE_KEY: {{ .google.key | quote }}
- COMMENTO_GOOGLE_SECRET: {{ .google.secret | quote }}
- {{- end }}
- {{- if .github.enabled }}
- COMMENTO_GITHUB_KEY: {{ .github.key | quote }}
- COMMENTO_GITHUB_SECRET: {{ .github.secret | quote }}
- {{- end }}
- {{- if .gitlab.enabled }}
- COMMENTO_GITLAB_KEY: {{ .gitlab.key | quote }}
- COMMENTO_GITLAB_SECRET: {{ .gitlab.secret | quote }}
- {{- end }}
- {{- if .twitter.enabled }}
- COMMENTO_TWITTER_KEY: {{ .twitter.key | quote }}
- COMMENTO_TWITTER_SECRET: {{ .twitter.secret | quote }}
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/commento/templates/secureconfig.yaml b/charts/commento/templates/secureconfig.yaml
new file mode 100644
index 00000000..2dea83e8
--- /dev/null
+++ b/charts/commento/templates/secureconfig.yaml
@@ -0,0 +1,42 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ include "commento.fullname" . }}
+ labels:
+ {{- include "commento.labels" . | nindent 4 }}
+type: Opaque
+data:
+{{- if .Values.postgres.enabled }}
+ COMMENTO_POSTGRES: {{ (printf "postgres://%s:%s@%s:%s/%s?sslmode=disable" .Values.postgres.userDatabase.user .Values.postgres.userDatabase.password (include "postgres.servicename" .) (.Values.postgres.service.port | toString) .Values.postgres.userDatabase.name) | b64enc }}
+{{- else }}
+{{- with .Values.externalDatabase }}
+ COMMENTO_POSTGRES: {{ (printf "mongodb://%s:%s@%s/%s?sslmode=disable" .user .password .host (.port | toString) .name) | b64enc }}
+{{- end }}
+{{- end }}
+{{- with .Values.settings.smtp }}
+ {{- if .enabled }}
+ COMMENTO_SMTP_USERNAME: {{ .name | b64enc }}
+ COMMENTO_SMTP_PASSWORD: {{ .password | b64enc }}
+ {{- end }}
+{{- end }}
+{{- if .Values.settings.akismetKey }}
+ COMMENTO_AKISMET_KEY: {{ .Values.settings.akismetKey | b64enc }}
+{{- end }}
+{{- with .Values.settings.oauth }}
+ {{- if .google.enabled }}
+ COMMENTO_GOOGLE_KEY: {{ .google.key | b64enc }}
+ COMMENTO_GOOGLE_SECRET: {{ .google.secret | b64enc }}
+ {{- end }}
+ {{- if .github.enabled }}
+ COMMENTO_GITHUB_KEY: {{ .github.key | b64enc }}
+ COMMENTO_GITHUB_SECRET: {{ .github.secret | b64enc }}
+ {{- end }}
+ {{- if .gitlab.enabled }}
+ COMMENTO_GITLAB_KEY: {{ .gitlab.key | b64enc }}
+ COMMENTO_GITLAB_SECRET: {{ .gitlab.secret | b64enc }}
+ {{- end }}
+ {{- if .twitter.enabled }}
+ COMMENTO_TWITTER_KEY: {{ .twitter.key | b64enc }}
+ COMMENTO_TWITTER_SECRET: {{ .twitter.secret | b64enc }}
+ {{- end }}
+{{- end }}
diff --git a/charts/commento/values.yaml b/charts/commento/values.yaml
index 907fd239..24e5a88e 100644
--- a/charts/commento/values.yaml
+++ b/charts/commento/values.yaml
@@ -12,6 +12,9 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
+## Pod deployment strategy
+strategy: {}
+
## Optional service account
serviceAccount:
# Specifies whether a service account should be created
@@ -79,6 +82,9 @@ affinity: {}
containerPort: 8080
+## Custom liveness probe (overwrites default liveness probe)
+customLivenessProbe: {}
+
## Default liveness probe
livenessProbe:
enabled: true
@@ -88,6 +94,9 @@ livenessProbe:
successThreshold: 1
periodSeconds: 10
+## Custom readiness probe (overwrites default readiness probe)
+customReadinessProbe: {}
+
## Default readiness probe
readinessProbe:
enabled: true
--
GitLab