From 9f4b7993fd1f22ead3cefaa9bada16e9841e7047 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Fri, 3 May 2024 09:17:52 +0000 Subject: [PATCH] Publish new changes in catalog --- charts/wg-easy/{2.0.16 => 2.0.17}/.helmignore | 0 charts/wg-easy/{2.0.16 => 2.0.17}/Chart.lock | 0 charts/wg-easy/{2.0.16 => 2.0.17}/Chart.yaml | 2 +- charts/wg-easy/{2.0.16 => 2.0.17}/README.md | 0 charts/wg-easy/{2.0.16 => 2.0.17}/app-readme.md | 0 .../{2.0.16 => 2.0.17}/charts/common-1.2.9.tgz | Bin .../wg-easy/{2.0.16 => 2.0.17}/ci/test-values.yaml | 0 charts/wg-easy/{2.0.16 => 2.0.17}/ix_values.yaml | 1 + charts/wg-easy/{2.0.16 => 2.0.17}/metadata.yaml | 0 .../wg-easy/{2.0.16 => 2.0.17}/migrations/migrate | 2 ++ charts/wg-easy/{2.0.16 => 2.0.17}/questions.yaml | 11 ++++++++++- .../wg-easy/{2.0.16 => 2.0.17}/templates/NOTES.txt | 0 .../{2.0.16 => 2.0.17}/templates/_migration.tpl | 0 .../{2.0.16 => 2.0.17}/templates/_persistence.tpl | 0 .../{2.0.16 => 2.0.17}/templates/_portal.tpl | 0 .../{2.0.16 => 2.0.17}/templates/_service.tpl | 0 .../{2.0.16 => 2.0.17}/templates/_wgeasy.tpl | 2 +- .../{2.0.16 => 2.0.17}/templates/common.yaml | 0 .../wg-easy/{2.0.16 => 2.0.17}/to_keep_versions.md | 0 19 files changed, 15 insertions(+), 3 deletions(-) rename charts/wg-easy/{2.0.16 => 2.0.17}/.helmignore (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/Chart.lock (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/Chart.yaml (97%) rename charts/wg-easy/{2.0.16 => 2.0.17}/README.md (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/app-readme.md (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/charts/common-1.2.9.tgz (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/ci/test-values.yaml (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/ix_values.yaml (96%) rename charts/wg-easy/{2.0.16 => 2.0.17}/metadata.yaml (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/migrations/migrate (95%) rename charts/wg-easy/{2.0.16 => 2.0.17}/questions.yaml (97%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/NOTES.txt (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/_migration.tpl (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/_persistence.tpl (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/_portal.tpl (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/_service.tpl (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/_wgeasy.tpl (98%) rename charts/wg-easy/{2.0.16 => 2.0.17}/templates/common.yaml (100%) rename charts/wg-easy/{2.0.16 => 2.0.17}/to_keep_versions.md (100%) diff --git a/charts/wg-easy/2.0.16/.helmignore b/charts/wg-easy/2.0.17/.helmignore similarity index 100% rename from charts/wg-easy/2.0.16/.helmignore rename to charts/wg-easy/2.0.17/.helmignore diff --git a/charts/wg-easy/2.0.16/Chart.lock b/charts/wg-easy/2.0.17/Chart.lock similarity index 100% rename from charts/wg-easy/2.0.16/Chart.lock rename to charts/wg-easy/2.0.17/Chart.lock diff --git a/charts/wg-easy/2.0.16/Chart.yaml b/charts/wg-easy/2.0.17/Chart.yaml similarity index 97% rename from charts/wg-easy/2.0.16/Chart.yaml rename to charts/wg-easy/2.0.17/Chart.yaml index 39ad45c7a9..5e011f6224 100644 --- a/charts/wg-easy/2.0.16/Chart.yaml +++ b/charts/wg-easy/2.0.17/Chart.yaml @@ -3,7 +3,7 @@ description: WG-Easy is the easiest way to install & manage WireGuard! annotations: title: WG Easy type: application -version: 2.0.16 +version: 2.0.17 apiVersion: v2 appVersion: '12' kubeVersion: '>=1.16.0-0' diff --git a/charts/wg-easy/2.0.16/README.md b/charts/wg-easy/2.0.17/README.md similarity index 100% rename from charts/wg-easy/2.0.16/README.md rename to charts/wg-easy/2.0.17/README.md diff --git a/charts/wg-easy/2.0.16/app-readme.md b/charts/wg-easy/2.0.17/app-readme.md similarity index 100% rename from charts/wg-easy/2.0.16/app-readme.md rename to charts/wg-easy/2.0.17/app-readme.md diff --git a/charts/wg-easy/2.0.16/charts/common-1.2.9.tgz b/charts/wg-easy/2.0.17/charts/common-1.2.9.tgz similarity index 100% rename from charts/wg-easy/2.0.16/charts/common-1.2.9.tgz rename to charts/wg-easy/2.0.17/charts/common-1.2.9.tgz diff --git a/charts/wg-easy/2.0.16/ci/test-values.yaml b/charts/wg-easy/2.0.17/ci/test-values.yaml similarity index 100% rename from charts/wg-easy/2.0.16/ci/test-values.yaml rename to charts/wg-easy/2.0.17/ci/test-values.yaml diff --git a/charts/wg-easy/2.0.16/ix_values.yaml b/charts/wg-easy/2.0.17/ix_values.yaml similarity index 96% rename from charts/wg-easy/2.0.16/ix_values.yaml rename to charts/wg-easy/2.0.17/ix_values.yaml index 3824f47ceb..52f7da725e 100644 --- a/charts/wg-easy/2.0.16/ix_values.yaml +++ b/charts/wg-easy/2.0.17/ix_values.yaml @@ -19,6 +19,7 @@ wgNetwork: wgConfig: host: '' + externalPort: 51820 password: '' keepAlive: 0 clientMTU: 1420 diff --git a/charts/wg-easy/2.0.16/metadata.yaml b/charts/wg-easy/2.0.17/metadata.yaml similarity index 100% rename from charts/wg-easy/2.0.16/metadata.yaml rename to charts/wg-easy/2.0.17/metadata.yaml diff --git a/charts/wg-easy/2.0.16/migrations/migrate b/charts/wg-easy/2.0.17/migrations/migrate similarity index 95% rename from charts/wg-easy/2.0.16/migrations/migrate rename to charts/wg-easy/2.0.17/migrations/migrate index c3c949d3d6..8525d6859c 100755 --- a/charts/wg-easy/2.0.16/migrations/migrate +++ b/charts/wg-easy/2.0.17/migrations/migrate @@ -78,6 +78,8 @@ def migrate(values): if not 'wgeasy' in values.keys(): return values + if not values['wgConfig'].get('externalPort', None): + values['wgConfig']['externalPort'] = values['wgNetwork'].get('udpPort', 30057) return migrate_common_lib(values) diff --git a/charts/wg-easy/2.0.16/questions.yaml b/charts/wg-easy/2.0.17/questions.yaml similarity index 97% rename from charts/wg-easy/2.0.16/questions.yaml rename to charts/wg-easy/2.0.17/questions.yaml index 08eef36eb9..c343c92166 100644 --- a/charts/wg-easy/2.0.16/questions.yaml +++ b/charts/wg-easy/2.0.17/questions.yaml @@ -98,6 +98,15 @@ questions: required: true $ref: - "definitions/nodeIP" + - variable: externalPort + label: Port for Client Configuration + description: | + The port accessible from the clients.
+ This is ONLY used on the client configuration generation in the "Endpoint" field. + schema: + type: int + required: true + default: 51820 - variable: password label: Password for WebUI description: When set, requires a password when logging in to the Web UI. @@ -435,7 +444,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/charts/wg-easy/2.0.16/templates/NOTES.txt b/charts/wg-easy/2.0.17/templates/NOTES.txt similarity index 100% rename from charts/wg-easy/2.0.16/templates/NOTES.txt rename to charts/wg-easy/2.0.17/templates/NOTES.txt diff --git a/charts/wg-easy/2.0.16/templates/_migration.tpl b/charts/wg-easy/2.0.17/templates/_migration.tpl similarity index 100% rename from charts/wg-easy/2.0.16/templates/_migration.tpl rename to charts/wg-easy/2.0.17/templates/_migration.tpl diff --git a/charts/wg-easy/2.0.16/templates/_persistence.tpl b/charts/wg-easy/2.0.17/templates/_persistence.tpl similarity index 100% rename from charts/wg-easy/2.0.16/templates/_persistence.tpl rename to charts/wg-easy/2.0.17/templates/_persistence.tpl diff --git a/charts/wg-easy/2.0.16/templates/_portal.tpl b/charts/wg-easy/2.0.17/templates/_portal.tpl similarity index 100% rename from charts/wg-easy/2.0.16/templates/_portal.tpl rename to charts/wg-easy/2.0.17/templates/_portal.tpl diff --git a/charts/wg-easy/2.0.16/templates/_service.tpl b/charts/wg-easy/2.0.17/templates/_service.tpl similarity index 100% rename from charts/wg-easy/2.0.16/templates/_service.tpl rename to charts/wg-easy/2.0.17/templates/_service.tpl diff --git a/charts/wg-easy/2.0.16/templates/_wgeasy.tpl b/charts/wg-easy/2.0.17/templates/_wgeasy.tpl similarity index 98% rename from charts/wg-easy/2.0.16/templates/_wgeasy.tpl rename to charts/wg-easy/2.0.17/templates/_wgeasy.tpl index 06293a7fbd..d5cdec1511 100644 --- a/charts/wg-easy/2.0.16/templates/_wgeasy.tpl +++ b/charts/wg-easy/2.0.17/templates/_wgeasy.tpl @@ -23,7 +23,7 @@ workload: - NET_RAW - SYS_MODULE env: - WG_PORT: {{ .Values.wgNetwork.udpPort }} + WG_PORT: {{ .Values.wgConfig.externalPort }} WG_PATH: /etc/wireguard PORT: {{ .Values.wgNetwork.webPort }} WG_HOST: {{ .Values.wgConfig.host | quote }} diff --git a/charts/wg-easy/2.0.16/templates/common.yaml b/charts/wg-easy/2.0.17/templates/common.yaml similarity index 100% rename from charts/wg-easy/2.0.16/templates/common.yaml rename to charts/wg-easy/2.0.17/templates/common.yaml diff --git a/charts/wg-easy/2.0.16/to_keep_versions.md b/charts/wg-easy/2.0.17/to_keep_versions.md similarity index 100% rename from charts/wg-easy/2.0.16/to_keep_versions.md rename to charts/wg-easy/2.0.17/to_keep_versions.md