From 41f8760980433f49c79986e08109c8f942731664 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Fri, 5 Apr 2024 11:19:45 +0000 Subject: [PATCH] Publish new changes in catalog --- .../{1.0.28 => 1.0.29}/Chart.lock | 0 .../{1.0.28 => 1.0.29}/Chart.yaml | 2 +- .../{1.0.28 => 1.0.29}/README.md | 0 .../{1.0.28 => 1.0.29}/app-readme.md | 0 .../charts/common-1.2.9.tgz | Bin .../{1.0.28 => 1.0.29}/ci/basic-values.yaml | 0 .../{1.0.28 => 1.0.29}/ix_values.yaml | 3 +++ .../{1.0.28 => 1.0.29}/metadata.yaml | 0 .../{1.0.28 => 1.0.29}/migrations/migrate | 9 +++++++ .../{1.0.28 => 1.0.29}/questions.yaml | 22 ++++++++++++++++++ .../{1.0.28 => 1.0.29}/templates/NOTES.txt | 0 .../{1.0.28 => 1.0.29}/templates/_npm.tpl | 9 +++---- .../{1.0.28 => 1.0.29}/templates/_portal.tpl | 0 .../{1.0.28 => 1.0.29}/templates/common.yaml | 0 .../{1.3.6 => 1.3.7}/Chart.lock | 0 .../{1.3.6 => 1.3.7}/Chart.yaml | 4 ++-- .../{1.3.6 => 1.3.7}/README.md | 0 .../{1.3.6 => 1.3.7}/app-readme.md | 0 .../{1.3.6 => 1.3.7}/charts/common-1.2.9.tgz | Bin .../{1.3.6 => 1.3.7}/ci/basic-values.yaml | 0 .../{1.3.6 => 1.3.7}/ci/extra-values.yaml | 0 .../{1.3.6 => 1.3.7}/ci/hostNet-values.yaml | 0 .../{1.3.6 => 1.3.7}/ci/https-values.yaml | 0 .../{1.3.6 => 1.3.7}/ix_values.yaml | 0 .../{1.3.6 => 1.3.7}/metadata.yaml | 0 .../{1.3.6 => 1.3.7}/migrations/migrate | 0 .../{1.3.6 => 1.3.7}/questions.yaml | 6 ++--- .../{1.3.6 => 1.3.7}/templates/NOTES.txt | 0 .../templates/_persistence.tpl | 0 .../{1.3.6 => 1.3.7}/templates/_portal.tpl | 0 .../{1.3.6 => 1.3.7}/templates/_service.tpl | 0 .../{1.3.6 => 1.3.7}/templates/_unifi.tpl | 0 .../{1.3.6 => 1.3.7}/templates/common.yaml | 0 33 files changed, 45 insertions(+), 10 deletions(-) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/Chart.lock (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/Chart.yaml (97%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/README.md (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/app-readme.md (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/charts/common-1.2.9.tgz (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/ci/basic-values.yaml (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/ix_values.yaml (93%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/metadata.yaml (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/migrations/migrate (72%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/questions.yaml (92%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/templates/NOTES.txt (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/templates/_npm.tpl (93%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/templates/_portal.tpl (100%) rename community/nginx-proxy-manager/{1.0.28 => 1.0.29}/templates/common.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/Chart.lock (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/Chart.yaml (94%) rename community/unifi-controller/{1.3.6 => 1.3.7}/README.md (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/app-readme.md (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/charts/common-1.2.9.tgz (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/ci/basic-values.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/ci/extra-values.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/ci/hostNet-values.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/ci/https-values.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/ix_values.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/metadata.yaml (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/migrations/migrate (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/questions.yaml (98%) rename community/unifi-controller/{1.3.6 => 1.3.7}/templates/NOTES.txt (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/templates/_persistence.tpl (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/templates/_portal.tpl (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/templates/_service.tpl (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/templates/_unifi.tpl (100%) rename community/unifi-controller/{1.3.6 => 1.3.7}/templates/common.yaml (100%) diff --git a/community/nginx-proxy-manager/1.0.28/Chart.lock b/community/nginx-proxy-manager/1.0.29/Chart.lock similarity index 100% rename from community/nginx-proxy-manager/1.0.28/Chart.lock rename to community/nginx-proxy-manager/1.0.29/Chart.lock diff --git a/community/nginx-proxy-manager/1.0.28/Chart.yaml b/community/nginx-proxy-manager/1.0.29/Chart.yaml similarity index 97% rename from community/nginx-proxy-manager/1.0.28/Chart.yaml rename to community/nginx-proxy-manager/1.0.29/Chart.yaml index 267688f2e1..03446d0113 100644 --- a/community/nginx-proxy-manager/1.0.28/Chart.yaml +++ b/community/nginx-proxy-manager/1.0.29/Chart.yaml @@ -3,7 +3,7 @@ description: Expose your services easily and securely annotations: title: Nginx Proxy Manager type: application -version: 1.0.28 +version: 1.0.29 apiVersion: v2 appVersion: 2.11.1 kubeVersion: '>=1.16.0-0' diff --git a/community/nginx-proxy-manager/1.0.28/README.md b/community/nginx-proxy-manager/1.0.29/README.md similarity index 100% rename from community/nginx-proxy-manager/1.0.28/README.md rename to community/nginx-proxy-manager/1.0.29/README.md diff --git a/community/nginx-proxy-manager/1.0.28/app-readme.md b/community/nginx-proxy-manager/1.0.29/app-readme.md similarity index 100% rename from community/nginx-proxy-manager/1.0.28/app-readme.md rename to community/nginx-proxy-manager/1.0.29/app-readme.md diff --git a/community/nginx-proxy-manager/1.0.28/charts/common-1.2.9.tgz b/community/nginx-proxy-manager/1.0.29/charts/common-1.2.9.tgz similarity index 100% rename from community/nginx-proxy-manager/1.0.28/charts/common-1.2.9.tgz rename to community/nginx-proxy-manager/1.0.29/charts/common-1.2.9.tgz diff --git a/community/nginx-proxy-manager/1.0.28/ci/basic-values.yaml b/community/nginx-proxy-manager/1.0.29/ci/basic-values.yaml similarity index 100% rename from community/nginx-proxy-manager/1.0.28/ci/basic-values.yaml rename to community/nginx-proxy-manager/1.0.29/ci/basic-values.yaml diff --git a/community/nginx-proxy-manager/1.0.28/ix_values.yaml b/community/nginx-proxy-manager/1.0.29/ix_values.yaml similarity index 93% rename from community/nginx-proxy-manager/1.0.28/ix_values.yaml rename to community/nginx-proxy-manager/1.0.29/ix_values.yaml index 2be74a1b90..687cf753a9 100644 --- a/community/nginx-proxy-manager/1.0.28/ix_values.yaml +++ b/community/nginx-proxy-manager/1.0.29/ix_values.yaml @@ -12,6 +12,9 @@ npmNetwork: webPort: 30020 httpPort: 30021 httpsPort: 30022 +npmID: + user: 568 + group: 568 npmStorage: data: type: ixVolume diff --git a/community/nginx-proxy-manager/1.0.28/metadata.yaml b/community/nginx-proxy-manager/1.0.29/metadata.yaml similarity index 100% rename from community/nginx-proxy-manager/1.0.28/metadata.yaml rename to community/nginx-proxy-manager/1.0.29/metadata.yaml diff --git a/community/nginx-proxy-manager/1.0.28/migrations/migrate b/community/nginx-proxy-manager/1.0.29/migrations/migrate similarity index 72% rename from community/nginx-proxy-manager/1.0.28/migrations/migrate rename to community/nginx-proxy-manager/1.0.29/migrations/migrate index 8eef1e9357..fde3ef1e66 100755 --- a/community/nginx-proxy-manager/1.0.28/migrations/migrate +++ b/community/nginx-proxy-manager/1.0.29/migrations/migrate @@ -16,6 +16,15 @@ def migrate(values): values[storageKey][storage] = {key: value for key, value in check_val.items() if key != 'hostPath'} + # If there is no npmID, add it defaults to + # 1000 to account for existing installations + if values.get('npmID', None) is None: + values.update({ + 'npmID': { + 'user': 1000, + 'group': 1000 + } + }) return values diff --git a/community/nginx-proxy-manager/1.0.28/questions.yaml b/community/nginx-proxy-manager/1.0.29/questions.yaml similarity index 92% rename from community/nginx-proxy-manager/1.0.28/questions.yaml rename to community/nginx-proxy-manager/1.0.29/questions.yaml index 430d96b515..d5dbee0382 100644 --- a/community/nginx-proxy-manager/1.0.28/questions.yaml +++ b/community/nginx-proxy-manager/1.0.29/questions.yaml @@ -59,6 +59,28 @@ questions: schema: type: string required: true + - variable: npmID + label: "" + group: User and Group Configuration + schema: + type: dict + attrs: + - variable: user + label: User ID + description: The user id that Nginx Proxy Manager files will be owned by. + schema: + type: int + min: 2 + default: 568 + required: true + - variable: group + label: Group ID + description: The group id that Nginx Proxy Manager files will be owned by. + schema: + type: int + min: 2 + default: 568 + required: true - variable: npmNetwork label: "" diff --git a/community/nginx-proxy-manager/1.0.28/templates/NOTES.txt b/community/nginx-proxy-manager/1.0.29/templates/NOTES.txt similarity index 100% rename from community/nginx-proxy-manager/1.0.28/templates/NOTES.txt rename to community/nginx-proxy-manager/1.0.29/templates/NOTES.txt diff --git a/community/nginx-proxy-manager/1.0.28/templates/_npm.tpl b/community/nginx-proxy-manager/1.0.29/templates/_npm.tpl similarity index 93% rename from community/nginx-proxy-manager/1.0.28/templates/_npm.tpl rename to community/nginx-proxy-manager/1.0.29/templates/_npm.tpl index 903aad776a..7fef5c1ddc 100644 --- a/community/nginx-proxy-manager/1.0.28/templates/_npm.tpl +++ b/community/nginx-proxy-manager/1.0.29/templates/_npm.tpl @@ -1,4 +1,7 @@ {{- define "npm.workload" -}} +{{- if not .Values.npmID -}} + {{- $_ := set .Values "npmID" dict -}} +{{- end }} workload: npm: enabled: true @@ -7,7 +10,7 @@ workload: podSpec: hostNetwork: false securityContext: - fsGroup: 1000 + fsGroup: {{ .Values.npmID.group | default 1000 }} containers: npm: enabled: true @@ -30,9 +33,7 @@ workload: # Needed for: Nginx Service - FOWNER fixedEnv: - # FIXME: Revisit once upstream irons out some issues in regarids with PUID. - # Make sure 568 PUID works before exposing - PUID: 1000 + PUID: {{ .Values.npmID.user | default 1000 }} env: DISABLE_IPV6: true DB_SQLITE_FILE: /data/database.sqlite diff --git a/community/nginx-proxy-manager/1.0.28/templates/_portal.tpl b/community/nginx-proxy-manager/1.0.29/templates/_portal.tpl similarity index 100% rename from community/nginx-proxy-manager/1.0.28/templates/_portal.tpl rename to community/nginx-proxy-manager/1.0.29/templates/_portal.tpl diff --git a/community/nginx-proxy-manager/1.0.28/templates/common.yaml b/community/nginx-proxy-manager/1.0.29/templates/common.yaml similarity index 100% rename from community/nginx-proxy-manager/1.0.28/templates/common.yaml rename to community/nginx-proxy-manager/1.0.29/templates/common.yaml diff --git a/community/unifi-controller/1.3.6/Chart.lock b/community/unifi-controller/1.3.7/Chart.lock similarity index 100% rename from community/unifi-controller/1.3.6/Chart.lock rename to community/unifi-controller/1.3.7/Chart.lock diff --git a/community/unifi-controller/1.3.6/Chart.yaml b/community/unifi-controller/1.3.7/Chart.yaml similarity index 94% rename from community/unifi-controller/1.3.6/Chart.yaml rename to community/unifi-controller/1.3.7/Chart.yaml index a5d0cc6718..d88e6713b1 100644 --- a/community/unifi-controller/1.3.6/Chart.yaml +++ b/community/unifi-controller/1.3.7/Chart.yaml @@ -3,10 +3,10 @@ description: Unifi Controller is a network management controller for Unifi Equip annotations: title: Unifi Controller type: application -version: 1.3.6 +version: 1.3.7 apiVersion: v2 appVersion: 8.1.113 -kubeVersion: '>=1.16.0-0' +kubeVersion: ">=1.16.0-0" maintainers: - name: truenas url: https://www.truenas.com/ diff --git a/community/unifi-controller/1.3.6/README.md b/community/unifi-controller/1.3.7/README.md similarity index 100% rename from community/unifi-controller/1.3.6/README.md rename to community/unifi-controller/1.3.7/README.md diff --git a/community/unifi-controller/1.3.6/app-readme.md b/community/unifi-controller/1.3.7/app-readme.md similarity index 100% rename from community/unifi-controller/1.3.6/app-readme.md rename to community/unifi-controller/1.3.7/app-readme.md diff --git a/community/unifi-controller/1.3.6/charts/common-1.2.9.tgz b/community/unifi-controller/1.3.7/charts/common-1.2.9.tgz similarity index 100% rename from community/unifi-controller/1.3.6/charts/common-1.2.9.tgz rename to community/unifi-controller/1.3.7/charts/common-1.2.9.tgz diff --git a/community/unifi-controller/1.3.6/ci/basic-values.yaml b/community/unifi-controller/1.3.7/ci/basic-values.yaml similarity index 100% rename from community/unifi-controller/1.3.6/ci/basic-values.yaml rename to community/unifi-controller/1.3.7/ci/basic-values.yaml diff --git a/community/unifi-controller/1.3.6/ci/extra-values.yaml b/community/unifi-controller/1.3.7/ci/extra-values.yaml similarity index 100% rename from community/unifi-controller/1.3.6/ci/extra-values.yaml rename to community/unifi-controller/1.3.7/ci/extra-values.yaml diff --git a/community/unifi-controller/1.3.6/ci/hostNet-values.yaml b/community/unifi-controller/1.3.7/ci/hostNet-values.yaml similarity index 100% rename from community/unifi-controller/1.3.6/ci/hostNet-values.yaml rename to community/unifi-controller/1.3.7/ci/hostNet-values.yaml diff --git a/community/unifi-controller/1.3.6/ci/https-values.yaml b/community/unifi-controller/1.3.7/ci/https-values.yaml similarity index 100% rename from community/unifi-controller/1.3.6/ci/https-values.yaml rename to community/unifi-controller/1.3.7/ci/https-values.yaml diff --git a/community/unifi-controller/1.3.6/ix_values.yaml b/community/unifi-controller/1.3.7/ix_values.yaml similarity index 100% rename from community/unifi-controller/1.3.6/ix_values.yaml rename to community/unifi-controller/1.3.7/ix_values.yaml diff --git a/community/unifi-controller/1.3.6/metadata.yaml b/community/unifi-controller/1.3.7/metadata.yaml similarity index 100% rename from community/unifi-controller/1.3.6/metadata.yaml rename to community/unifi-controller/1.3.7/metadata.yaml diff --git a/community/unifi-controller/1.3.6/migrations/migrate b/community/unifi-controller/1.3.7/migrations/migrate similarity index 100% rename from community/unifi-controller/1.3.6/migrations/migrate rename to community/unifi-controller/1.3.7/migrations/migrate diff --git a/community/unifi-controller/1.3.6/questions.yaml b/community/unifi-controller/1.3.7/questions.yaml similarity index 98% rename from community/unifi-controller/1.3.6/questions.yaml rename to community/unifi-controller/1.3.7/questions.yaml index 8cdc4d92d8..480cb37ac6 100644 --- a/community/unifi-controller/1.3.6/questions.yaml +++ b/community/unifi-controller/1.3.7/questions.yaml @@ -74,8 +74,8 @@ questions: max: 65535 required: true - variable: enableWebHttp - label: Enable Web HTTP - description: Enable HTTP for the Unifi Controller Web UI. + label: Enable Web HTTP / Inform Port + description: Enable HTTP for the Unifi Controller Inform Port. schema: type: boolean default: false @@ -391,7 +391,7 @@ questions: schema: type: string max_length: 12 - valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' + valid_chars: "^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$" valid_chars_error: | Valid Memory limit formats are
- Suffixed with E/P/T/G/M/K - eg. 1G
diff --git a/community/unifi-controller/1.3.6/templates/NOTES.txt b/community/unifi-controller/1.3.7/templates/NOTES.txt similarity index 100% rename from community/unifi-controller/1.3.6/templates/NOTES.txt rename to community/unifi-controller/1.3.7/templates/NOTES.txt diff --git a/community/unifi-controller/1.3.6/templates/_persistence.tpl b/community/unifi-controller/1.3.7/templates/_persistence.tpl similarity index 100% rename from community/unifi-controller/1.3.6/templates/_persistence.tpl rename to community/unifi-controller/1.3.7/templates/_persistence.tpl diff --git a/community/unifi-controller/1.3.6/templates/_portal.tpl b/community/unifi-controller/1.3.7/templates/_portal.tpl similarity index 100% rename from community/unifi-controller/1.3.6/templates/_portal.tpl rename to community/unifi-controller/1.3.7/templates/_portal.tpl diff --git a/community/unifi-controller/1.3.6/templates/_service.tpl b/community/unifi-controller/1.3.7/templates/_service.tpl similarity index 100% rename from community/unifi-controller/1.3.6/templates/_service.tpl rename to community/unifi-controller/1.3.7/templates/_service.tpl diff --git a/community/unifi-controller/1.3.6/templates/_unifi.tpl b/community/unifi-controller/1.3.7/templates/_unifi.tpl similarity index 100% rename from community/unifi-controller/1.3.6/templates/_unifi.tpl rename to community/unifi-controller/1.3.7/templates/_unifi.tpl diff --git a/community/unifi-controller/1.3.6/templates/common.yaml b/community/unifi-controller/1.3.7/templates/common.yaml similarity index 100% rename from community/unifi-controller/1.3.6/templates/common.yaml rename to community/unifi-controller/1.3.7/templates/common.yaml