From 4e9895663ee698ad912ed7604cecadd7281ebadb Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:32:45 -0400 Subject: [PATCH] fix(firezone) fix secret keys to the correct base64 format (#9726) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** secret keys require a min of 64 chars. ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/incubator/firezone/Chart.yaml | 2 +- charts/incubator/firezone/templates/_secrets.tpl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/incubator/firezone/Chart.yaml b/charts/incubator/firezone/Chart.yaml index 2b945b5d046..5247f9a3f84 100644 --- a/charts/incubator/firezone/Chart.yaml +++ b/charts/incubator/firezone/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/firezone - https://github.com/firezone/firezone type: application -version: 0.0.2 +version: 0.0.3 annotations: truecharts.org/catagories: | - vpn diff --git a/charts/incubator/firezone/templates/_secrets.tpl b/charts/incubator/firezone/templates/_secrets.tpl index 8390618aad5..8e3a689c668 100644 --- a/charts/incubator/firezone/templates/_secrets.tpl +++ b/charts/incubator/firezone/templates/_secrets.tpl @@ -1,12 +1,12 @@ {{/* Define the secrets */}} {{- define "firezone.secrets" -}} {{- $secretName := (printf "%s-firezone-secrets" (include "tc.v1.common.lib.chart.names.fullname" $)) -}} -{{- $keyGuardian := randAlphaNum 32 -}} -{{- $keyDatabase := randAlphaNum 32 -}} -{{- $keySecret := randAlphaNum 32 -}} -{{- $keyLive := randAlphaNum 32 -}} -{{- $keyCookieSigning := randAlphaNum 32 -}} -{{- $keyCookieEncrypt := randAlphaNum 32 -}} +{{- $keyGuardian := randAlphaNum 64 -}} +{{- $keyDatabase := randAlphaNum 64 -}} +{{- $keySecret := randAlphaNum 64 -}} +{{- $keyLive := randAlphaNum 64 -}} +{{- $keyCookieSigning := randAlphaNum 64 -}} +{{- $keyCookieEncrypt := randAlphaNum 64 -}} {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}} {{- $keyGuardian = index .data "GUARDIAN_SECRET_KEY" | b64dec -}} {{- $keyDatabase = index .data "DATABASE_ENCRYPTION_KEY" | b64dec -}}