From bc82014bb6707c31164c8ef5077b92a8b0448628 Mon Sep 17 00:00:00 2001 From: Sven Rahn Date: Sun, 9 Jul 2023 16:32:57 +0200 Subject: [PATCH] fix(kopia) Actually use kopia credentials (#10342) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** The server credentials set by the user are never used by kopia because of a typo. ⚒️ 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 --------- Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Co-authored-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> --- charts/incubator/kopia/Chart.yaml | 2 +- charts/incubator/kopia/questions.yaml | 36 +++++++++----------- charts/incubator/kopia/templates/_secret.tpl | 2 +- charts/incubator/kopia/values.yaml | 8 ++--- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/charts/incubator/kopia/Chart.yaml b/charts/incubator/kopia/Chart.yaml index b66568c47e6..dcfa8416de2 100644 --- a/charts/incubator/kopia/Chart.yaml +++ b/charts/incubator/kopia/Chart.yaml @@ -19,7 +19,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/kopia - https://kopia.io/docs/installation/#docker-images - https://github.com/kopia/kopia -version: 6.0.4 +version: 6.0.5 annotations: truecharts.org/catagories: | - utility diff --git a/charts/incubator/kopia/questions.yaml b/charts/incubator/kopia/questions.yaml index ec62aac2dc7..c8031adc461 100644 --- a/charts/incubator/kopia/questions.yaml +++ b/charts/incubator/kopia/questions.yaml @@ -12,42 +12,38 @@ questions: # Include{containerMain} - variable: kopia - group: "App Configuration" - label: "Image Environment" + group: App Configuration + label: Kopia Configuration schema: additional_attrs: true type: dict attrs: - - variable: USER - label: "Kopia User" - description: "Repository user" + - variable: user + label: Repo User schema: type: string - default: "secret" + default: "" required: true - - variable: KOPIA_PASSWORD - label: "Kopia Password" - description: "Repository password" + - variable: password + label: Repo Password schema: type: string - default: "secret" - required: true + default: "" private: true - - variable: KOPIA_SERVER_USERNAME - label: "Kopia Server Username" - description: "Username for WebUI" + required: true + - variable: server_username + label: Server UserName schema: type: string - default: "server_user" + default: "" required: true - - variable: KOPIA_SERVER_PASSWORD - label: "Kopia Server Password" - description: "Password for WebUI" + - variable: server_password + label: Server Password schema: type: string - default: "server_password" - required: true + default: "" private: true + required: true # Include{containerBasic} # Include{containerAdvanced} diff --git a/charts/incubator/kopia/templates/_secret.tpl b/charts/incubator/kopia/templates/_secret.tpl index a9753ada237..2e6a40a02bb 100644 --- a/charts/incubator/kopia/templates/_secret.tpl +++ b/charts/incubator/kopia/templates/_secret.tpl @@ -5,6 +5,6 @@ enabled: true data: USER: {{ .Values.kopia.user | default "user" }} KOPIA_PASSWORD: {{ .Values.kopia.password | default "secret" }} - KOPIA_SERVER_USERNAME: {{ .Values.kopia.server_password | default "server_user" }} + KOPIA_SERVER_USERNAME: {{ .Values.kopia.server_username | default "server_user" }} KOPIA_SERVER_PASSWORD: {{ .Values.kopia.server_password | default "server_password" }} {{- end }} diff --git a/charts/incubator/kopia/values.yaml b/charts/incubator/kopia/values.yaml index 88ee2af9fd8..389f33aa907 100644 --- a/charts/incubator/kopia/values.yaml +++ b/charts/incubator/kopia/values.yaml @@ -11,10 +11,10 @@ service: port: 10238 kopia: - kopia_user: "user" - kopia_password: "secret" - kopia_server_username: "user" - kopia_server_password: "password" + user: "user" + password: "secret" + server_username: "user" + server_password: "password" workload: main: