From 6c612cc66c087b7490f5c5fcc5f0a78e46dff55a Mon Sep 17 00:00:00 2001
From: zzamzam <zam-zam@users.noreply.github.com>
Date: Sat, 19 Mar 2022 18:04:20 +0300
Subject: [PATCH] Fix/remark42 (#919)

* Remark42. Allow to enable smtp but do not provide credentials to send emails without auth

* Remark42. Fix some wrong oauth credentials insertion from chart to env values

* Incremented chart version and added releasnotes

Co-authored-by: Goeran Poehner <goeran.poehner@gmail.com>
---
 charts/remark42/Chart.yaml                  |  2 +-
 charts/remark42/README.md                   |  2 +-
 charts/remark42/RELEASENOTES.md             |  1 +
 charts/remark42/templates/secureconfig.yaml | 12 ++++++------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/charts/remark42/Chart.yaml b/charts/remark42/Chart.yaml
index 69193c65..847714e8 100644
--- a/charts/remark42/Chart.yaml
+++ b/charts/remark42/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.3.3
+version: 0.3.4
 
 appVersion: "v1.9.0"
 
diff --git a/charts/remark42/README.md b/charts/remark42/README.md
index 9f343770..105158f7 100644
--- a/charts/remark42/README.md
+++ b/charts/remark42/README.md
@@ -1,6 +1,6 @@
 # Remark42
 
-![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.9.0](https://img.shields.io/badge/AppVersion-v1.9.0-informational?style=flat-square)
+![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.9.0](https://img.shields.io/badge/AppVersion-v1.9.0-informational?style=flat-square)
 
 A Helm chart for Remark42 on Kubernetes
 
diff --git a/charts/remark42/RELEASENOTES.md b/charts/remark42/RELEASENOTES.md
index 8a24bdd0..808083ac 100644
--- a/charts/remark42/RELEASENOTES.md
+++ b/charts/remark42/RELEASENOTES.md
@@ -4,4 +4,5 @@
 | :------------ | :---------- | :----------------- |
 | 0.3.2 | v1.9.0 | Fixed ingress API detection |
 | 0.3.3 | v1.9.0 | Updated chart dependencies |
+| 0.3.4 | v1.9.0 | Fixed auth. configuration |
 | | | |
diff --git a/charts/remark42/templates/secureconfig.yaml b/charts/remark42/templates/secureconfig.yaml
index fb4fc807..ffbeb0f1 100644
--- a/charts/remark42/templates/secureconfig.yaml
+++ b/charts/remark42/templates/secureconfig.yaml
@@ -29,19 +29,19 @@ data:
   AUTH_GITHUB_CSEC: {{ .github.secret | b64enc }}
   {{- end }}
   {{- if .facebook.enabled }}
-  AUTH_FACEBOOK_CID: {{ .gitlab.key | b64enc }}
-  AUTH_FACEBOOK_CSEC: {{ .gitlab.secret | b64enc }}
+  AUTH_FACEBOOK_CID: {{ .facebook.key | b64enc }}
+  AUTH_FACEBOOK_CSEC: {{ .facebook.secret | b64enc }}
   {{- end }}
   {{- if .twitter.enabled }}
   AUTH_TWITTER_CID: {{ .twitter.key | b64enc }}
   AUTH_TWITTER_CSEC: {{ .twitter.secret | b64enc }}
   {{- end }}
   {{- if .microsoft.enabled }}
-  AUTH_MICROSOFT_CID: {{ .twitter.key | b64enc }}
-  AUTH_MICROSOFT_CSEC: {{ .twitter.secret | b64enc }}
+  AUTH_MICROSOFT_CID: {{ .microsoft.key | b64enc }}
+  AUTH_MICROSOFT_CSEC: {{ .microsoft.secret | b64enc }}
   {{- end }}
   {{- if .yandex.enabled }}
-  AUTH_YANDEX_CID: {{ .twitter.key | b64enc }}
-  AUTH_YANDEX_CSEC: {{ .twitter.secret | b64enc }}
+  AUTH_YANDEX_CID: {{ .yandex.key | b64enc }}
+  AUTH_YANDEX_CSEC: {{ .yandex.secret | b64enc }}
   {{- end }}
 {{- end }}
-- 
GitLab