From d2f992c004cb1d6081fe8e4ded6a28fb20a8c518 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Wed, 3 Jan 2024 16:13:29 -0500 Subject: [PATCH] feat(kitchenowl): Add OIDC providers (#16748) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Added OIDC providers based on this page (since it has to be done on the backend) -> https://docs.kitchenowl.org/self-hosting/oidc/ ⚒️ Fixes #16699 **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 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:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 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 - [ ] ⬆️ 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._ --------- Signed-off-by: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/kitchenowl/Chart.yaml | 2 +- charts/stable/kitchenowl/questions.yaml | 42 +++++++++++++++++++++++++ charts/stable/kitchenowl/values.yaml | 7 +++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/charts/stable/kitchenowl/Chart.yaml b/charts/stable/kitchenowl/Chart.yaml index 1b417b1fd4b..fbb4e8ec61d 100644 --- a/charts/stable/kitchenowl/Chart.yaml +++ b/charts/stable/kitchenowl/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: kitchenowl -version: 8.1.5 +version: 8.2.0 appVersion: latest description: KitchenOwl is a smart self-hosted grocery list and recipe manager. home: https://truecharts.org/charts/stable/kitchenowl diff --git a/charts/stable/kitchenowl/questions.yaml b/charts/stable/kitchenowl/questions.yaml index e534e160b63..db45841eaea 100644 --- a/charts/stable/kitchenowl/questions.yaml +++ b/charts/stable/kitchenowl/questions.yaml @@ -23,6 +23,48 @@ questions: type: string required: true default: "" + - variable: OIDC_ISSUER + label: "OIDC Issuer" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" + - variable: OIDC_CLIENT_ID + label: "OIDC Client ID" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" + - variable: OIDC_CLIENT_SECRET + label: "OIDC Client Secret" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" + - variable: APPLE_CLIENT_ID + label: "Apple Client ID" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" + - variable: APPLE_CLIENT_SECRET + label: "Apple Client Secret" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" + - variable: GOOGLE_CLIENT_ID + label: "Google Client ID" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" + - variable: GOOGLE_CLIENT_SECRET + label: "Google Client Secret" + description: "See https://docs.kitchenowl.org/self-hosting/oidc/" + schema: + type: string + default: "" # Include{containerBasic} # Include{containerAdvanced} # Include{containerConfig} diff --git a/charts/stable/kitchenowl/values.yaml b/charts/stable/kitchenowl/values.yaml index 8c154b37514..e26c8c64eaf 100644 --- a/charts/stable/kitchenowl/values.yaml +++ b/charts/stable/kitchenowl/values.yaml @@ -82,6 +82,13 @@ workload: imageSelector: backendImage env: FRONT_URL: "{{ .Values.workload.main.podSpec.containers.main.env.FRONT_URL }}" + OIDC_ISSUER: "" + OIDC_CLIENT_ID: "" + OIDC_CLIENT_SECRET: "" + APPLE_CLIENT_ID: "" + APPLE_CLIENT_SECRET: "" + GOOGLE_CLIENT_ID: "" + GOOGLE_CLIENT_SECRET: "" # Changed port to 10248 to avoid conflict with frontend HTTP_PORT: "10248" JWT_SECRET_KEY: