From ebd58f8a2fe4ef435b155dfae579c43bb9e300d3 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sat, 22 Jul 2023 11:10:38 +0300 Subject: [PATCH] fix(homebox): ints must be quoted in CMs/Secrets. (#10732) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #10391 **⚙️ 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 - [x] ⚠️ 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/stable/homebox/Chart.yaml | 2 +- charts/stable/homebox/questions.yaml | 6 ---- charts/stable/homebox/templates/_secret.tpl | 10 +++---- charts/stable/homebox/templates/common.yaml | 2 +- charts/stable/homebox/values.yaml | 32 ++++++++++++--------- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/charts/stable/homebox/Chart.yaml b/charts/stable/homebox/Chart.yaml index bc559c8f5c4..ae9e005d769 100644 --- a/charts/stable/homebox/Chart.yaml +++ b/charts/stable/homebox/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/homebox - https://github.com/hay-kot/homebox type: application -version: 2.0.25 +version: 2.0.26 annotations: truecharts.org/catagories: | - inventory diff --git a/charts/stable/homebox/questions.yaml b/charts/stable/homebox/questions.yaml index f151105a361..439f9042e70 100644 --- a/charts/stable/homebox/questions.yaml +++ b/charts/stable/homebox/questions.yaml @@ -6,14 +6,11 @@ questions: # Include{global} # Include{workload} # Include{workloadDeployment} - # Include{replicas1} # Include{podSpec} # Include{containerMain} - # Include{containerBasic} # Include{containerAdvanced} - - variable: homebox group: App Configuration label: Homebox Configuration @@ -108,7 +105,6 @@ questions: private: true required: true default: "" - # Include{containerConfig} # Include{podOptions} # Include{serviceRoot} @@ -154,7 +150,6 @@ questions: # Include{ingressAdvanced} # Include{ingressList} # Include{securityContextRoot} - - variable: runAsUser label: "runAsUser" description: "The UserID of the user running the application" @@ -176,7 +171,6 @@ questions: schema: type: int default: 568 - # Include{resources} # Include{advanced} # Include{addons} diff --git a/charts/stable/homebox/templates/_secret.tpl b/charts/stable/homebox/templates/_secret.tpl index b3a51f34966..066bb974bbd 100644 --- a/charts/stable/homebox/templates/_secret.tpl +++ b/charts/stable/homebox/templates/_secret.tpl @@ -15,10 +15,10 @@ data: HBOX_LOG_LEVEL: {{ .Values.homebox.log_level | default "info" }} HBOX_LOG_FORMAT: {{ .Values.homebox.log_format | default "text" }} {{- if .Values.homebox.mailer_host }} - HBOX_MAILER_HOST: {{ .Values.homebox.mailer_host }} - HBOX_MAILER_PORT: {{ .Values.homebox.mailer_port }} - HBOX_MAILER_FROM: {{ .Values.homebox.mailer_from }} - HBOX_MAILER_USERNAME: {{ .Values.homebox.mailer_username }} - HBOX_MAILER_PASSWORD: {{ .Values.homebox.mailer_password }} + HBOX_MAILER_HOST: {{ .Values.homebox.mailer_host | quote }} + HBOX_MAILER_PORT: {{ .Values.homebox.mailer_port | quote }} + HBOX_MAILER_FROM: {{ .Values.homebox.mailer_from | quote }} + HBOX_MAILER_USERNAME: {{ .Values.homebox.mailer_username | quote }} + HBOX_MAILER_PASSWORD: {{ .Values.homebox.mailer_password | quote }} {{- end }} {{- end }} diff --git a/charts/stable/homebox/templates/common.yaml b/charts/stable/homebox/templates/common.yaml index da9b3507a0a..27eeb290243 100644 --- a/charts/stable/homebox/templates/common.yaml +++ b/charts/stable/homebox/templates/common.yaml @@ -4,7 +4,7 @@ {{/* Render secrets for homebox */}} {{- $secrets := include "homebox.secret" . | fromYaml -}} {{- if $secrets -}} -{{- $_ := set .Values.secret "homebox-secret" $secrets -}} + {{- $_ := set .Values.secret "homebox-secret" $secrets -}} {{- end -}} {{/* Render the templates */}} diff --git a/charts/stable/homebox/values.yaml b/charts/stable/homebox/values.yaml index 47fd5671bfb..f2937e33565 100644 --- a/charts/stable/homebox/values.yaml +++ b/charts/stable/homebox/values.yaml @@ -2,6 +2,7 @@ image: repository: tccr.io/truecharts/homebox pullPolicy: IfNotPresent tag: v0.9.2@sha256:0936a8959013589504264a0f52698a661c50a127700ba32f99f19838fe75966c + homebox: allow_registration: true auto_increment_asset_id: true @@ -13,19 +14,6 @@ homebox: mailer_from: "" mailer_username: "" mailer_password: "" -service: - main: - ports: - main: - protocol: http - port: 10603 -persistence: - data: - enabled: true - mountPath: /data -portal: - open: - enabled: true workload: main: @@ -34,4 +22,20 @@ workload: main: envFrom: - secretRef: - name: "homebox-secret" + name: homebox-secret + +service: + main: + ports: + main: + protocol: http + port: 10603 + +persistence: + data: + enabled: true + mountPath: /data + +portal: + open: + enabled: true