From 461f756c88d932de530a3ee337d9bd6a5259eb7d Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 28 May 2025 10:37:18 +0200 Subject: [PATCH] [virtual-machine] Set PortList method by default Signed-off-by: Andrei Kvapil --- packages/apps/versions_map | 4 ++-- packages/apps/virtual-machine/Chart.yaml | 4 ++-- packages/apps/virtual-machine/Makefile | 2 +- packages/apps/virtual-machine/README.md | 2 +- packages/apps/virtual-machine/values.schema.json | 6 +++--- packages/apps/virtual-machine/values.yaml | 2 +- packages/apps/vm-instance/Chart.yaml | 4 ++-- packages/apps/vm-instance/Makefile | 2 +- packages/apps/vm-instance/README.md | 2 +- packages/apps/vm-instance/values.schema.json | 6 +++--- packages/apps/vm-instance/values.yaml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 74ccb112..be176c6a 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -159,7 +159,7 @@ virtual-machine 0.8.1 93c46161 virtual-machine 0.8.2 de19450f virtual-machine 0.9.0 721c12a7 virtual-machine 0.9.1 93bdf411 -virtual-machine 0.9.2 HEAD +virtual-machine 0.10.0 HEAD vm-disk 0.1.0 d971f2ff vm-disk 0.1.1 HEAD vm-instance 0.1.0 1ec10165 @@ -170,7 +170,7 @@ vm-instance 0.4.1 0ab39f20 vm-instance 0.5.0 3fa4dd3a vm-instance 0.5.1 de19450f vm-instance 0.6.0 721c12a7 -vm-instance 0.6.1 HEAD +vm-instance 0.7.0 HEAD vpn 0.1.0 263e47be vpn 0.2.0 53f2365e vpn 0.3.0 6c5cf5bf diff --git a/packages/apps/virtual-machine/Chart.yaml b/packages/apps/virtual-machine/Chart.yaml index 87358d5b..000ccba6 100644 --- a/packages/apps/virtual-machine/Chart.yaml +++ b/packages/apps/virtual-machine/Chart.yaml @@ -17,10 +17,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.2 +version: 0.10.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.9.2 +appVersion: 0.10.0 diff --git a/packages/apps/virtual-machine/Makefile b/packages/apps/virtual-machine/Makefile index f3de3546..5d31cacf 100644 --- a/packages/apps/virtual-machine/Makefile +++ b/packages/apps/virtual-machine/Makefile @@ -9,4 +9,4 @@ generate: && yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json yq -i -o json '.properties.systemDisk.properties.image.enum = ["ubuntu", "cirros", "alpine", "fedora", "talos"]' values.schema.json - yq -i -o json '.properties.externalMethod.enum = ["WholeIP", "PortList"]' values.schema.json + yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json diff --git a/packages/apps/virtual-machine/README.md b/packages/apps/virtual-machine/README.md index bb33570b..8c9b382c 100644 --- a/packages/apps/virtual-machine/README.md +++ b/packages/apps/virtual-machine/README.md @@ -39,7 +39,7 @@ virtctl ssh @ | Name | Description | Value | | ------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------ | | `external` | Enable external access from outside the cluster | `false` | -| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `WholeIP` | +| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList` | | `externalPorts` | Specify ports to forward from outside the cluster | `[]` | | `running` | Determines if the virtual machine should be running | `true` | | `instanceType` | Virtual Machine instance type | `u1.medium` | diff --git a/packages/apps/virtual-machine/values.schema.json b/packages/apps/virtual-machine/values.schema.json index 861d4da4..ea0efd4c 100644 --- a/packages/apps/virtual-machine/values.schema.json +++ b/packages/apps/virtual-machine/values.schema.json @@ -10,10 +10,10 @@ "externalMethod": { "type": "string", "description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`", - "default": "WholeIP", + "default": "PortList", "enum": [ - "WholeIP", - "PortList" + "PortList", + "WholeIP" ] }, "externalPorts": { diff --git a/packages/apps/virtual-machine/values.yaml b/packages/apps/virtual-machine/values.yaml index 6cccbad1..191a86a5 100644 --- a/packages/apps/virtual-machine/values.yaml +++ b/packages/apps/virtual-machine/values.yaml @@ -4,7 +4,7 @@ ## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` ## @param externalPorts [array] Specify ports to forward from outside the cluster external: false -externalMethod: WholeIP +externalMethod: PortList externalPorts: - 22 diff --git a/packages/apps/vm-instance/Chart.yaml b/packages/apps/vm-instance/Chart.yaml index b0b6a3b9..8011ca1f 100644 --- a/packages/apps/vm-instance/Chart.yaml +++ b/packages/apps/vm-instance/Chart.yaml @@ -17,10 +17,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.1 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.6.0 +appVersion: 0.7.0 diff --git a/packages/apps/vm-instance/Makefile b/packages/apps/vm-instance/Makefile index 5b2aebab..3a9a0fd8 100644 --- a/packages/apps/vm-instance/Makefile +++ b/packages/apps/vm-instance/Makefile @@ -9,4 +9,4 @@ generate: PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \ && yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json - yq -i -o json '.properties.externalMethod.enum = ["WholeIP", "PortList"]' values.schema.json + yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json diff --git a/packages/apps/vm-instance/README.md b/packages/apps/vm-instance/README.md index 273c1f15..611595a0 100644 --- a/packages/apps/vm-instance/README.md +++ b/packages/apps/vm-instance/README.md @@ -39,7 +39,7 @@ virtctl ssh @ | Name | Description | Value | | ------------------ | ---------------------------------------------------------------------------------------------------------- | ----------- | | `external` | Enable external access from outside the cluster | `false` | -| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `WholeIP` | +| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList` | | `externalPorts` | Specify ports to forward from outside the cluster | `[]` | | `running` | Determines if the virtual machine should be running | `true` | | `instanceType` | Virtual Machine instance type | `u1.medium` | diff --git a/packages/apps/vm-instance/values.schema.json b/packages/apps/vm-instance/values.schema.json index f4dd2076..8ce71cdb 100644 --- a/packages/apps/vm-instance/values.schema.json +++ b/packages/apps/vm-instance/values.schema.json @@ -10,10 +10,10 @@ "externalMethod": { "type": "string", "description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`", - "default": "WholeIP", + "default": "PortList", "enum": [ - "WholeIP", - "PortList" + "PortList", + "WholeIP" ] }, "externalPorts": { diff --git a/packages/apps/vm-instance/values.yaml b/packages/apps/vm-instance/values.yaml index eb68ced2..4b21423d 100644 --- a/packages/apps/vm-instance/values.yaml +++ b/packages/apps/vm-instance/values.yaml @@ -4,7 +4,7 @@ ## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` ## @param externalPorts [array] Specify ports to forward from outside the cluster external: false -externalMethod: WholeIP +externalMethod: PortList externalPorts: - 22