Move files between payload folders;Define upgrade vapp properties;Join metacluster

scripts/Update-OvfConfiguration.upgrade.yml

@@ -42,7 +42,7 @@ PropertyCategories:
   - Key: metacluster.password
     Type: password(7..)
     Label: Appliance password*
-    Description: 'Initial password for respective administrator accounts within each component'
+    Description: ''
     DefaultValue: ''
     Configurations: '*'
     UserConfigurable: true
@@ -65,9 +65,17 @@ PropertyCategories:
 
   - Key: metacluster.fqdn
     Type: string(1..)
-    Label: Appliance FQDN*
-    Description: Respective subdomains will be available for each component (e.g. storage.example.org); this address should already be configured as a wildcard record within your DNS zone.
-    DefaultValue: meta.k8s.cluster
+    Label: Meta-cluster FQDN/IP-address*
+    Description: The address of the target meta-cluster which this appliance will perform an upgrade on.
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+
+  - key: metacluster.token
+    Type: string(1..)
+    Label: K3s install token*
+    Description: Must match the token originally used for the target meta-cluster
+    DefaultValue: ''
     Configurations: '*'
     UserConfigurable: true
 
@@ -95,53 +103,18 @@ PropertyCategories:
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 2) Workload-cluster
-  ProductProperties:
-
-  - Key: workloadcluster.name
-    Type: string(1..15)
-    Label: Workload-cluster name*
-    Description: ''
-    DefaultValue: 'workload-{{ hostname.suffix }}'
-    Configurations: '*'
-    UserConfigurable: true
-
-  - Key: workloadcluster.vip
-    Type: ip
-    Label: Workload-cluster virtual IP*
-    Description: Workload-cluster control plane endpoint virtual IP
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-  - Key: ippool.startip
-    Type: ip
-    Label: Workload-cluster IP-pool start IP*
-    Description: All nodes for the workload-cluster will be provisioned within this IP pool
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-  - Key: ippool.endip
-    Type: ip
-    Label: Workload-cluster IP-pool end IP*
-    Description: All nodes for the workload-cluster will be provisioned within this IP pool
-    DefaultValue: ''
-    Configurations: '*'
-    UserConfigurable: true
-
-- Name: 3) Common
+- Name: 2) Common
   ProductProperties:
 
   - Key: guestinfo.rootsshkey
     Type: password(1..)
     Label: SSH public key*
-    Description: Authentication for any node (meta-cluster *and* workloadcluster); this line should start with 'ssh-rsa AAAAB3N'
+    Description: Authentication for this meta-cluster node; this line should start with 'ssh-rsa AAAAB3N'
     DefaultValue: ''
     Configurations: '*'
     UserConfigurable: true
 
-- Name: 4) Hypervisor
+- Name: 3) Hypervisor
   ProductProperties:
 
   - Key: hv.fqdn