From 5bad465540039f0ae41ed55126db4f3da971cfbf Mon Sep 17 00:00:00 2001
From: Taehyun Kim <kgyoo8232@gmail.com>
Date: Tue, 12 Feb 2019 00:00:02 +0900
Subject: [PATCH] [stable/hackmd] bump hackmd (codimd) (#8593)

* codimd

Signed-off-by: Taehyun Kim <kgyoo8232@gmail.com>

* add variables in README

Signed-off-by: Taehyun Kim <kgyoo8232@gmail.com>

* remove NODE_ENV, add HMD_DB_URL

Signed-off-by: Taehyun Kim <kgyoo8232@gmail.com>

* bump chart version

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
---
 stable/hackmd/Chart.yaml                |  2 +-
 stable/hackmd/README.md                 |  2 ++
 stable/hackmd/templates/deployment.yaml | 15 +++++++++++++--
 stable/hackmd/templates/secret.yaml     | 16 ++++++++++++++++
 stable/hackmd/values.yaml               |  2 ++
 5 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 stable/hackmd/templates/secret.yaml

diff --git a/stable/hackmd/Chart.yaml b/stable/hackmd/Chart.yaml
index fe5049690a..8c2e25f736 100644
--- a/stable/hackmd/Chart.yaml
+++ b/stable/hackmd/Chart.yaml
@@ -1,6 +1,6 @@
 name: hackmd
 apiVersion: v1
-version: "1.0.1"
+version: "1.1.0"
 appVersion: "1.2.1-alpine"
 description: Realtime collaborative markdown notes on all platforms.
 icon: https://hackmd.io/favicon.png
diff --git a/stable/hackmd/README.md b/stable/hackmd/README.md
index 143b02a7e5..24dc4664d8 100644
--- a/stable/hackmd/README.md
+++ b/stable/hackmd/README.md
@@ -45,6 +45,8 @@ Parameter | Description | Default
 `persistence.size` | Persistent Volume size | `2Gi`
 `persistence.storageClass` | Persistent Volume Storage Class |  `unset`
 `extraVars` | Hackmd's extra environment variables | `[]`
+`podAnnotations` | Pod annotations | `{}`
+`sessionSecret` | Hackmd's session secret | `""` (Randomly generated)
 `postgresql.install` | Enable PostgreSQL as a chart dependency | `true`
 `postgresql.imageTag` | The image tag for PostgreSQL | `9.6.2`
 `postgresql.postgresUser` | PostgreSQL User to create | `hackmd`
diff --git a/stable/hackmd/templates/deployment.yaml b/stable/hackmd/templates/deployment.yaml
index ac3046e57d..32a41d2cba 100644
--- a/stable/hackmd/templates/deployment.yaml
+++ b/stable/hackmd/templates/deployment.yaml
@@ -18,6 +18,10 @@ spec:
       labels:
         app: {{ template "hackmd.name" . }}
         release: {{ .Release.Name }}
+{{- with .Values.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}
@@ -38,7 +42,7 @@ spec:
               port: 3000
             initialDelaySeconds: 30
           env:
-            - name: HMD_DB_PASSWORD
+            - name: CMD_DB_PASSWORD
               {{- if .Values.postgresql.install }}
               valueFrom:
                 secretKeyRef:
@@ -47,8 +51,15 @@ spec:
               {{- else }}
               value: {{ .Values.postgresql.postgresPassword }}
               {{- end }}
+            - name: CMD_SESSION_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "hackmd.fullname" . }}
+                  key: sessionSecret
+            - name: CMD_DB_URL
+              value: postgres://{{ .Values.postgresql.postgresUser }}:$(CMD_DB_PASSWORD)@{{ template "hackmd.database.host" . }}:5432/{{ .Values.postgresql.postgresDatabase }}
             - name: HMD_DB_URL
-              value: postgres://{{ .Values.postgresql.postgresUser }}:$(HMD_DB_PASSWORD)@{{ template "hackmd.database.host" . }}:5432/{{ .Values.postgresql.postgresDatabase }}
+              value: postgres://{{ .Values.postgresql.postgresUser }}:$(CMD_DB_PASSWORD)@{{ template "hackmd.database.host" . }}:5432/{{ .Values.postgresql.postgresDatabase }}
             {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 12 }}
             {{- end }}
diff --git a/stable/hackmd/templates/secret.yaml b/stable/hackmd/templates/secret.yaml
new file mode 100644
index 0000000000..f04b4f4fdc
--- /dev/null
+++ b/stable/hackmd/templates/secret.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "hackmd.fullname" . }}
+  labels:
+    app: {{ template "hackmd.name" . }}
+    chart: {{ template "hackmd.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+type: Opaque
+data:
+  {{- if .Values.sessionSecret }}
+  sessionSecret: {{ .Values.sessionSecret | b64enc | quote }}
+  {{- else }}
+  sessionSecret: {{ randAlphaNum 10 | b64enc | quote }}
+  {{- end }}
diff --git a/stable/hackmd/values.yaml b/stable/hackmd/values.yaml
index e9ee2efb54..ccc2cb295b 100644
--- a/stable/hackmd/values.yaml
+++ b/stable/hackmd/values.yaml
@@ -64,6 +64,8 @@ persistence:
   ##
   # storageClass: "-"
 
+podAnnotations: {}
+
 extraVars: []
 
 nodeSelector: {}