From ad83be0825c7a6ebdadefded376bb6b736e121dd Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Mon, 9 Jan 2023 00:07:48 -0500 Subject: [PATCH] BREAKING CHANGES fix(shiori) fix postgres sidecar (#6167) * feat(shiori) fix postgres sidecar * Update charts/stable/shiori/templates/_secret.tpl Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/shiori/templates/_secret.tpl Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/shiori/values.yaml Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: Xstar97 * Update charts/stable/shiori/values.yaml Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> * fix envFrom * remove defaults * set mirror container Signed-off-by: Xstar97 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/shiori/Chart.yaml | 35 ++++++++-------- charts/stable/shiori/questions.yaml | 48 +++++++++++----------- charts/stable/shiori/templates/_secret.tpl | 23 +++++++++++ charts/stable/shiori/templates/common.yaml | 9 +++- charts/stable/shiori/values.yaml | 28 +++---------- 5 files changed, 79 insertions(+), 64 deletions(-) create mode 100644 charts/stable/shiori/templates/_secret.tpl diff --git a/charts/stable/shiori/Chart.yaml b/charts/stable/shiori/Chart.yaml index b55b12464b1..a3b3c8b82b8 100644 --- a/charts/stable/shiori/Chart.yaml +++ b/charts/stable/shiori/Chart.yaml @@ -1,21 +1,5 @@ apiVersion: v2 -appVersion: "1.5.0" -version: 10.0.16 -kubeVersion: ">=1.16.0-0" -name: shiori -description: A simple bookmark manager built with Go -type: application -home: https://truecharts.org/charts/stable/shiori -icon: https://truecharts.org/img/hotlink-ok/chart-icons/shiori.png -keywords: - - shiori - - bookmark - - bookmark-manager - - web-interface -sources: - - https://github.com/truecharts/charts/tree/master/charts/stable/shiori - - https://github.com/go-shiori/shiori - - https://github.com/nicholaswilde/docker-shiori +appVersion: "1.5.3" dependencies: - name: common repository: https://library-charts.truecharts.org @@ -24,10 +8,27 @@ dependencies: name: postgresql repository: https://charts.truecharts.org/ version: 11.0.18 +deprecated: false +description: A simple bookmark manager built with Go. +home: https://truecharts.org/charts/stable/shiori +icon: https://truecharts.org/img/hotlink-ok/chart-icons/shiori.png +keywords: + - shiori + - bookmark + - bookmark-manager + - web-interface +kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org name: TrueCharts url: https://truecharts.org +name: shiori +sources: + - https://github.com/truecharts/charts/tree/master/charts/stable/shiori + - https://github.com/go-shiori/shiori + - https://github.com/go-shiori/shiori/pkgs/container/shiori +type: application +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/shiori/questions.yaml b/charts/stable/shiori/questions.yaml index 263e6585db7..34b3ace7c6a 100644 --- a/charts/stable/shiori/questions.yaml +++ b/charts/stable/shiori/questions.yaml @@ -11,8 +11,8 @@ questions: # Include{containerConfig} # Include{serviceRoot} - variable: main - label: "Main Service" - description: "The Primary service on which the healthcheck runs, often the webUI" + label: Main Service + description: The Primary service on which the healthcheck runs, often the webUI schema: additional_attrs: true type: dict @@ -20,14 +20,14 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: main - label: "Main Service Port Configuration" + label: Main Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 10098 @@ -38,8 +38,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: data - label: "App Data Storage" - description: "Stores the Application Data." + label: App Data Storage + description: Stores the Application Data. schema: additional_attrs: true type: dict @@ -48,7 +48,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -60,41 +60,41 @@ questions: # Include{security} # Include{securityContextAdvancedRoot} - variable: privileged - label: "Privileged mode" + label: Privileged mode schema: type: boolean default: false - variable: readOnlyRootFilesystem - label: "ReadOnly Root Filesystem" + label: ReadOnly Root Filesystem schema: type: boolean default: true - variable: allowPrivilegeEscalation - label: "Allow Privilege Escalation" - schema: - type: boolean - default: true - - variable: runAsNonRoot - label: "runAsNonRoot" + label: Allow Privilege Escalation schema: type: boolean default: false + - variable: runAsNonRoot + label: runAsNonRoot + schema: + type: boolean + default: true # Include{podSecurityContextRoot} - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" + label: runAsUser + description: The UserID of the user running the application schema: type: int - default: 0 + default: 568 - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" + label: runAsGroup + description: The groupID this App of the user running the application schema: type: int - default: 0 + default: 568 - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." + label: fsGroup + description: The group that should own ALL storage. schema: type: int default: 568 diff --git a/charts/stable/shiori/templates/_secret.tpl b/charts/stable/shiori/templates/_secret.tpl new file mode 100644 index 00000000000..271799e2411 --- /dev/null +++ b/charts/stable/shiori/templates/_secret.tpl @@ -0,0 +1,23 @@ +{{/* Define the secret */}} +{{- define "shiori.secret" -}} + +{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) }} + +--- +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} + labels: + {{- include "tc.common.labels" . | nindent 4 }} +stringData: + SHIORI_DIR: {{ .Values.persistence.data.mountPath }} + + {{/* Database */}} + SHIORI_DBMS: "postgresql" + SHIORI_PG_PORT: "5432" + SHIORI_PG_USER: {{ .Values.postgresql.postgresqlUsername }} + SHIORI_PG_PASS: {{ .Values.postgresql.postgresqlPassword | trimAll "\"" }} + SHIORI_PG_NAME: {{ .Values.postgresql.postgresqlDatabase }} + SHIORI_PG_HOST: {{ .Values.postgresql.url.plain | trimAll "\"" }} +{{- end -}} diff --git a/charts/stable/shiori/templates/common.yaml b/charts/stable/shiori/templates/common.yaml index c1a366e1cf0..160ab84e33b 100644 --- a/charts/stable/shiori/templates/common.yaml +++ b/charts/stable/shiori/templates/common.yaml @@ -1 +1,8 @@ -{{ include "tc.common.loader.all" . }} +{{/* Make sure all variables are set properly */}} +{{- include "tc.common.loader.init" . }} + +{{/* Render secret */}} +{{- include "shiori.secret" . }} + +{{/* Render the templates */}} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/shiori/values.yaml b/charts/stable/shiori/values.yaml index 3affa29025d..d6bcab20b80 100644 --- a/charts/stable/shiori/values.yaml +++ b/charts/stable/shiori/values.yaml @@ -1,27 +1,11 @@ image: repository: tccr.io/truecharts/shiori pullPolicy: IfNotPresent - tag: version-v1.5.0@sha256:6c6331888c9a5162def49b6212327242f7f5c96e2d5a1bb031f79321cc1c0549 + tag: 1.5.3@sha256:99696bfc727ab1792297cba1e0ba755953bc0cfa38f2c19532c56d68985479a8 -securityContext: - allowPrivilegeEscalation: true - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -env: - SHIORI_PG_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" - SHIORI_PG_USER: "{{ .Values.postgresql.postgresqlUsername }}" - SHIORI_PG_PASS: - secretKeyRef: - name: dbcreds - key: postgresql-password - SHIORI_PG_HOST: - secretKeyRef: - name: dbcreds - key: plainhost +envFrom: + - secretRef: + name: '{{ include "tc.common.names.fullname" . }}-secret' service: main: @@ -33,13 +17,13 @@ service: persistence: data: enabled: true - mountPath: "/data" + mountPath: /data varrun: enabled: true postgresql: enabled: true - existingSecret: "dbcreds" + existingSecret: dbcreds postgresqlUsername: shiori postgresqlDatabase: shiori