From e5b501ddd566d32dcf1ae607ac75aa65071c904b Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:48:53 -0500 Subject: [PATCH] feat(ztncui-aio) migrate to new image + housekeeping (#15498) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Migrate to new image and house keeping for service names. ⚒️ Fixes #15497 **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ 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: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> --- charts/stable/ztcuui-aio/Chart.yaml | 13 +++-- charts/stable/ztcuui-aio/questions.yaml | 30 +++++++---- charts/stable/ztcuui-aio/values.yaml | 72 ++++++++++++++----------- 3 files changed, 66 insertions(+), 49 deletions(-) diff --git a/charts/stable/ztcuui-aio/Chart.yaml b/charts/stable/ztcuui-aio/Chart.yaml index e64a0429214..15265a581f5 100644 --- a/charts/stable/ztcuui-aio/Chart.yaml +++ b/charts/stable/ztcuui-aio/Chart.yaml @@ -1,16 +1,16 @@ -kubeVersion: ">=1.24.0-0" +kubeVersion: ">=1.24.0" apiVersion: v2 name: ztcuui-aio -version: 5.0.14 -appVersion: 1.2.16 +version: 5.0.15 +appVersion: 2023.5.2 description: ZeroTier network controller user interface in a Docker container home: https://truecharts.org/charts/stable/ztcuui-aio icon: https://truecharts.org/img/hotlink-ok/chart-icons/ztcuui-aio.png deprecated: false sources: - - https://github.com/key-networks/ztncui-aio - https://github.com/truecharts/charts/tree/master/charts/stable/ztcuui-aio - - https://hub.docker.com/r/keynetworks/ztncui + - https://github.com/kmahyyg/ztncui-aio + - https://ghcr.io/kmahyyg/ztncui-aio maintainers: - name: TrueCharts email: info@truecharts.org @@ -19,7 +19,7 @@ keywords: - ztcuui-aio dependencies: - name: common - version: 14.5.0 + version: 16.0.0 repository: https://library-charts.truecharts.org condition: "" alias: "" @@ -33,4 +33,3 @@ annotations: truecharts.org/max_helm_version: "3.13" truecharts.org/min_helm_version: "3.12" truecharts.org/train: stable -type: application diff --git a/charts/stable/ztcuui-aio/questions.yaml b/charts/stable/ztcuui-aio/questions.yaml index 24fbf0df9b2..e6e0ff3482b 100644 --- a/charts/stable/ztcuui-aio/questions.yaml +++ b/charts/stable/ztcuui-aio/questions.yaml @@ -53,17 +53,17 @@ questions: type: int default: 10257 required: true - - variable: other - label: "other Service" - description: "other service" + - variable: server + label: "Server Service" + description: "Server Service" schema: additional_attrs: true type: dict attrs: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - - variable: other - label: "other Service Port Configuration" + - variable: web + label: "Web Service Port Configuration" schema: additional_attrs: true type: dict @@ -75,9 +75,9 @@ questions: type: int default: 3180 required: true - - variable: other2 - label: "other Service" - description: "other service" + - variable: planet + label: "Planet Service" + description: "Planet Service" schema: additional_attrs: true type: dict @@ -102,14 +102,24 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: config - label: "config Storage" + label: App Config Storage + description: Stores the Application Config. schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - variable: zerotier - label: "Zerotier Storage" + label: App Zerotier Storage + description: Stores the Application Zerotier. + schema: + additional_attrs: true + type: dict + attrs: +# Include{persistenceBasic} + - variable: mkworld + label: App Mkworld Storage + description: Stores the Application Mkworld. schema: additional_attrs: true type: dict diff --git a/charts/stable/ztcuui-aio/values.yaml b/charts/stable/ztcuui-aio/values.yaml index f9cd8cbf16f..a760e43ec70 100644 --- a/charts/stable/ztcuui-aio/values.yaml +++ b/charts/stable/ztcuui-aio/values.yaml @@ -1,43 +1,36 @@ image: - repository: keynetworks/ztncui - tag: 1.2.16@sha256:db32c0778b13f6fe10d03e2c3dad96f0b311a0f482cdc2002506f0d68c27b73a + repository: ghcr.io/kmahyyg/ztncui-aio + tag: v2023.5.2-r1@sha256:d6aa0e1711596c74bb4401e19e33649b1534d41bdab1356f4e804884994fb74a pullPolicy: IfNotPresent -service: - main: - ports: - main: - port: 10258 - other: - enabled: true - ports: - other: - enabled: true - port: 3180 - targetPort: 3180 - other2: - enabled: true - ports: - other2: - enabled: true - protocol: udp - port: 9993 - targetPort: 9993 -persistence: - config: - enabled: true - mountPath: /opt/key-networks/ztncui/etc - zerotier: - enabled: true - mountPath: /var/lib/zerotier-one -portal: - open: - enabled: true + securityContext: container: readOnlyRootFilesystem: false runAsNonRoot: false runAsUser: 0 runAsGroup: 0 + +service: + main: + ports: + main: + port: 10258 + server: + enabled: true + ports: + web: + enabled: true + port: 3180 + targetPort: 3180 + planet: + enabled: true + ports: + planet: + enabled: true + protocol: udp + port: 9993 + targetPort: 9993 + workload: main: podSpec: @@ -49,3 +42,18 @@ workload: NODE_ENV: "production" MYDOMAIN: "test.truecharts.org" ZTNCUI_PASSWD: "CHANGEME" + +persistence: + config: + enabled: true + mountPath: /opt/key-networks/ztncui/etc + zerotier: + enabled: true + mountPath: /var/lib/zerotier-one + mkworld: + enabled: true + mountPath: /etc/zt-mkworld + +portal: + open: + enabled: true