From e930d9785abc316da25f35168e8e8d3e70f71484 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Sat, 8 Jul 2023 17:48:05 -0400 Subject: [PATCH] migrate(photostructure) migrate to new common **BREAKING CHANGES** (#10240) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** migrate app and update container image. ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [X] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 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._ --------- 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/incubator/photostructure/Chart.yaml | 26 +++---- .../incubator/photostructure/questions.yaml | 74 +++++++++---------- .../photostructure/templates/NOTES.txt | 1 + .../photostructure/templates/common.yaml | 3 +- charts/incubator/photostructure/values.yaml | 45 ++++++----- 5 files changed, 79 insertions(+), 70 deletions(-) create mode 100644 charts/incubator/photostructure/templates/NOTES.txt diff --git a/charts/incubator/photostructure/Chart.yaml b/charts/incubator/photostructure/Chart.yaml index d93f6d664dc..7f9e8c79755 100644 --- a/charts/incubator/photostructure/Chart.yaml +++ b/charts/incubator/photostructure/Chart.yaml @@ -1,18 +1,12 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - MediaApp-Photos - - MediaServer-Video - - MediaServer-Photos apiVersion: v2 -appVersion: "stable" +appVersion: "2.1.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.14.6 deprecated: false -description: "[b]PhotoStructure is your new home for all your photos and videos.[/b]\n" -home: https://truecharts.org/charts/incubator/photostructure +description: PhotoStructure is your new home for all your photos and videos. +home: https://truecharts.org/charts/stable/photostructure icon: https://truecharts.org/img/hotlink-ok/chart-icons/photostructure.png keywords: - photostructure @@ -26,7 +20,13 @@ maintainers: url: https://truecharts.org name: photostructure sources: - - https://github.com/truecharts/charts/tree/master/charts/incubator/photostructure - - https://photostructure.com/ + - https://github.com/truecharts/charts/tree/master/charts/stable/photostructure + - https://github.com/photostructure/photostructure-for-servers type: application -version: 2.0.9 +version: 3.0.0 +annotations: + truecharts.org/catagories: | + - MediaApp-Photos + - MediaServer-Video + - MediaServer-Photos + truecharts.org/SCALE-support: "true" diff --git a/charts/incubator/photostructure/questions.yaml b/charts/incubator/photostructure/questions.yaml index 413e432b1f0..4a662cec805 100644 --- a/charts/incubator/photostructure/questions.yaml +++ b/charts/incubator/photostructure/questions.yaml @@ -10,28 +10,28 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: PS_LOG_LEVEL + label: "PS Log Level" + schema: + type: string + private: true + default: "error" + enum: + - value: error + description: Error + - value: info + description: Info + # Include{containerBasic} # Include{containerAdvanced} - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: PS_LOG_LEVEL - label: "PS_LOG_LEVEL" - description: "Valid values are debug, info, warn, and error. Default is error, which (should be) quiet." - schema: - type: string - default: "" - - variable: UMASK - label: "UMASK" - description: "Files written by PhotoStructure will be applied with this umask." - schema: - type: string - default: "" # Include{containerConfig} # Include{serviceRoot} - variable: main @@ -60,33 +60,33 @@ questions: # Include{serviceExpert} # Include{serviceList} # Include{persistenceRoot} - - variable: library - label: "library Storage" - description: "This is where your PhotoStructure Library will be stored. It needs to have sufficient free space to hold preview images, and transcoded videos." + - variable: config + label: "App Config Storage" + description: "Stores the Application Config." schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - - variable: tempscratchdisk - label: "tempscratchdisk Storage" - description: "This must be fast, local disk." + - variable: library + label: "App Library Storage" + description: "Stores the Application Library." schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - variable: logs - label: "logs Storage" - description: "Logfiles will be written into this directory. Set environment variable " + label: "App Logs Storage" + description: "Stores the Application Logs." schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - - variable: config - label: "config Storage" - description: "System configuration is written into this directory." + - variable: tempscratchdisk + label: "App TempScratchDisk Storage" + description: "Stores the Application TempScratchDisk." schema: additional_attrs: true type: dict @@ -95,7 +95,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -108,14 +108,14 @@ questions: # Include{securityContextRoot} - 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 - variable: runAsGroup - label: "runAsGroup" - description: "The groupID of the user running the application" + label: runAsGroup + description: The groupID of the user running the application schema: type: int default: 0 @@ -123,8 +123,8 @@ questions: # Include{securityContextAdvanced} # Include{securityContextPod} - 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/incubator/photostructure/templates/NOTES.txt b/charts/incubator/photostructure/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/photostructure/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/photostructure/templates/common.yaml b/charts/incubator/photostructure/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/photostructure/templates/common.yaml +++ b/charts/incubator/photostructure/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/photostructure/values.yaml b/charts/incubator/photostructure/values.yaml index 8c0101e188d..c3cca6587f0 100644 --- a/charts/incubator/photostructure/values.yaml +++ b/charts/incubator/photostructure/values.yaml @@ -1,10 +1,31 @@ -env: - PS_LOG_LEVEL: "" - UMASK: "" image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/photostructure - tag: vstable@sha256:60d2f7530872c7b65a126221e59d16e356e269dce2ca68a3c3f4f0c3f46ff3bf + tag: v2.1.0@sha256:0c75885bdbb8bd64826af1ad36c12b3533aa6317cfbad2be4c5205368014ad80 + +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsGroup: 0 + runAsUser: 0 + +service: + main: + ports: + main: + protocol: http + port: 1787 + +workload: + main: + podSpec: + containers: + main: + env: + PS_HTTP_PORT: "{{ .Values.service.main.ports.main.port }}" + PS_LOG_LEVEL: "error" + persistence: config: enabled: true @@ -18,19 +39,7 @@ persistence: tempscratchdisk: enabled: true mountPath: /ps/tmp -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false -service: - main: - ports: - main: - port: 1787 - protocol: TCP - targetPort: 1787 portal: - enabled: true + open: + enabled: true