diff --git a/charts/wg-easy/2.0.18/.helmignore b/charts/wg-easy/2.0.19/.helmignore similarity index 100% rename from charts/wg-easy/2.0.18/.helmignore rename to charts/wg-easy/2.0.19/.helmignore diff --git a/charts/wg-easy/2.0.18/Chart.lock b/charts/wg-easy/2.0.19/Chart.lock similarity index 100% rename from charts/wg-easy/2.0.18/Chart.lock rename to charts/wg-easy/2.0.19/Chart.lock diff --git a/charts/wg-easy/2.0.18/Chart.yaml b/charts/wg-easy/2.0.19/Chart.yaml similarity index 97% rename from charts/wg-easy/2.0.18/Chart.yaml rename to charts/wg-easy/2.0.19/Chart.yaml index 52119ede6f..6f506892be 100644 --- a/charts/wg-easy/2.0.18/Chart.yaml +++ b/charts/wg-easy/2.0.19/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.18 +version: 2.0.19 apiVersion: v2 appVersion: '13' kubeVersion: '>=1.16.0-0' diff --git a/charts/wg-easy/2.0.18/README.md b/charts/wg-easy/2.0.19/README.md similarity index 100% rename from charts/wg-easy/2.0.18/README.md rename to charts/wg-easy/2.0.19/README.md diff --git a/charts/wg-easy/2.0.18/app-readme.md b/charts/wg-easy/2.0.19/app-readme.md similarity index 100% rename from charts/wg-easy/2.0.18/app-readme.md rename to charts/wg-easy/2.0.19/app-readme.md diff --git a/charts/wg-easy/2.0.18/charts/common-1.2.9.tgz b/charts/wg-easy/2.0.19/charts/common-1.2.9.tgz similarity index 100% rename from charts/wg-easy/2.0.18/charts/common-1.2.9.tgz rename to charts/wg-easy/2.0.19/charts/common-1.2.9.tgz diff --git a/charts/wg-easy/2.0.18/ci/test-values.yaml b/charts/wg-easy/2.0.19/ci/test-values.yaml similarity index 100% rename from charts/wg-easy/2.0.18/ci/test-values.yaml rename to charts/wg-easy/2.0.19/ci/test-values.yaml diff --git a/charts/wg-easy/2.0.18/ix_values.yaml b/charts/wg-easy/2.0.19/ix_values.yaml similarity index 100% rename from charts/wg-easy/2.0.18/ix_values.yaml rename to charts/wg-easy/2.0.19/ix_values.yaml diff --git a/charts/wg-easy/2.0.18/metadata.yaml b/charts/wg-easy/2.0.19/metadata.yaml similarity index 100% rename from charts/wg-easy/2.0.18/metadata.yaml rename to charts/wg-easy/2.0.19/metadata.yaml diff --git a/charts/wg-easy/2.0.18/migrations/migrate b/charts/wg-easy/2.0.19/migrations/migrate similarity index 86% rename from charts/wg-easy/2.0.18/migrations/migrate rename to charts/wg-easy/2.0.19/migrations/migrate index 8525d6859c..5d6d5fabd3 100755 --- a/charts/wg-easy/2.0.18/migrations/migrate +++ b/charts/wg-easy/2.0.19/migrations/migrate @@ -37,6 +37,7 @@ def migrate_common_lib(values): # Migrate Config 'wgConfig': { 'host': values['wgeasy']['host'], + 'externalPort': values.get('wgUDPPort', 30057), 'password': values['wgeasy'].get('password', ''), 'keepAlive': values['wgeasy']['keep_alive'], 'clientMTU': values['wgeasy']['client_mtu'], @@ -74,17 +75,22 @@ def migrate_common_lib(values): return values + def migrate(values): - if not 'wgeasy' in values.keys(): + # If we have migrated... + if 'wgConfig' in values.keys(): + # Make sure the externalPort is not missing. + if not values['wgConfig'].get('externalPort', None): + values['wgConfig']['externalPort'] = values['wgNetwork'].get('udpPort', 30057) return values - if not values['wgConfig'].get('externalPort', None): - values['wgConfig']['externalPort'] = values['wgNetwork'].get('udpPort', 30057) + # If this key is missing, we have already migrated. + if 'wgeasy' not in values.keys(): + return values return migrate_common_lib(values) - if __name__ == '__main__': if len(sys.argv) != 2: exit(1) diff --git a/charts/wg-easy/2.0.18/questions.yaml b/charts/wg-easy/2.0.19/questions.yaml similarity index 100% rename from charts/wg-easy/2.0.18/questions.yaml rename to charts/wg-easy/2.0.19/questions.yaml diff --git a/charts/wg-easy/2.0.18/templates/NOTES.txt b/charts/wg-easy/2.0.19/templates/NOTES.txt similarity index 100% rename from charts/wg-easy/2.0.18/templates/NOTES.txt rename to charts/wg-easy/2.0.19/templates/NOTES.txt diff --git a/charts/wg-easy/2.0.18/templates/_migration.tpl b/charts/wg-easy/2.0.19/templates/_migration.tpl similarity index 100% rename from charts/wg-easy/2.0.18/templates/_migration.tpl rename to charts/wg-easy/2.0.19/templates/_migration.tpl diff --git a/charts/wg-easy/2.0.18/templates/_persistence.tpl b/charts/wg-easy/2.0.19/templates/_persistence.tpl similarity index 100% rename from charts/wg-easy/2.0.18/templates/_persistence.tpl rename to charts/wg-easy/2.0.19/templates/_persistence.tpl diff --git a/charts/wg-easy/2.0.18/templates/_portal.tpl b/charts/wg-easy/2.0.19/templates/_portal.tpl similarity index 100% rename from charts/wg-easy/2.0.18/templates/_portal.tpl rename to charts/wg-easy/2.0.19/templates/_portal.tpl diff --git a/charts/wg-easy/2.0.18/templates/_service.tpl b/charts/wg-easy/2.0.19/templates/_service.tpl similarity index 100% rename from charts/wg-easy/2.0.18/templates/_service.tpl rename to charts/wg-easy/2.0.19/templates/_service.tpl diff --git a/charts/wg-easy/2.0.18/templates/_wgeasy.tpl b/charts/wg-easy/2.0.19/templates/_wgeasy.tpl similarity index 100% rename from charts/wg-easy/2.0.18/templates/_wgeasy.tpl rename to charts/wg-easy/2.0.19/templates/_wgeasy.tpl diff --git a/charts/wg-easy/2.0.18/templates/common.yaml b/charts/wg-easy/2.0.19/templates/common.yaml similarity index 100% rename from charts/wg-easy/2.0.18/templates/common.yaml rename to charts/wg-easy/2.0.19/templates/common.yaml diff --git a/charts/wg-easy/2.0.18/to_keep_versions.md b/charts/wg-easy/2.0.19/to_keep_versions.md similarity index 100% rename from charts/wg-easy/2.0.18/to_keep_versions.md rename to charts/wg-easy/2.0.19/to_keep_versions.md