F OpenNebula/one-apps#205: Add cluster/service CIDRs + cleanups

sk4zuzu · sk4zuzu · commit 1a8be5e7e75e · 2025-03-13T21:12:15.000+01:00
- Add ONEAPPS_K8S_CLUSTER_CIDR parameter
- Cleanup yaml syntax
diff --git a/appliances/OneKE_1.31/2a902664-98ed-4e78-80b6-af97dfd75371.yaml b/appliances/OneKE_1.31/2a902664-98ed-4e78-80b6-af97dfd75371.yaml
@@ -36,6 +36,12 @@ opennebula_template:
     ONEAPP_RKE2_SUPERVISOR_EP: "$ONEAPP_RKE2_SUPERVISOR_EP"
     ONEAPP_K8S_CONTROL_PLANE_EP: "$ONEAPP_K8S_CONTROL_PLANE_EP"
     ONEAPP_K8S_EXTRA_SANS: "$ONEAPP_K8S_EXTRA_SANS"
+    ONEAPP_K8S_CLUSTER_CIDR: "$ONEAPP_K8S_CLUSTER_CIDR"
+    ONEAPP_K8S_SERVICE_CIDR: "$ONEAPP_K8S_SERVICE_CIDR"
+    ONEAPP_K8S_HTTP_PROXY: "$ONEAPP_K8S_HTTP_PROXY"
+    ONEAPP_K8S_HTTPS_PROXY: "$ONEAPP_K8S_HTTPS_PROXY"
+    ONEAPP_K8S_NO_PROXY: "$ONEAPP_K8S_NO_PROXY"
+    ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED: "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
     ONEAPP_K8S_MULTUS_ENABLED: "$ONEAPP_K8S_MULTUS_ENABLED"
     ONEAPP_K8S_MULTUS_CONFIG: "$ONEAPP_K8S_MULTUS_CONFIG"
     ONEAPP_K8S_CNI_PLUGIN: "$ONEAPP_K8S_CNI_PLUGIN"
@@ -48,10 +54,6 @@ opennebula_template:
     ONEAPP_K8S_METALLB_CONFIG: "$ONEAPP_K8S_METALLB_CONFIG"
     ONEAPP_K8S_METALLB_RANGE: "$ONEAPP_K8S_METALLB_RANGE"
     ONEAPP_K8S_TRAEFIK_ENABLED: "$ONEAPP_K8S_TRAEFIK_ENABLED"
-    ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED: "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
-    ONEAPP_K8S_HTTP_PROXY: "$ONEAPP_K8S_HTTP_PROXY"
-    ONEAPP_K8S_HTTPS_PROXY: "$ONEAPP_K8S_HTTPS_PROXY"
-    ONEAPP_K8S_NO_PROXY: "$ONEAPP_K8S_NO_PROXY"
     ONEAPP_VNF_HAPROXY_LB0_IP: "$ONEAPP_VNF_HAPROXY_LB0_IP"
     ONEAPP_VNF_HAPROXY_LB0_PORT: "$ONEAPP_VNF_HAPROXY_LB0_PORT"
     ONEAPP_VNF_HAPROXY_LB1_IP: "$ONEAPP_VNF_HAPROXY_LB1_IP"
diff --git a/appliances/OneKE_1.31/4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml b/appliances/OneKE_1.31/4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml
@@ -22,35 +22,35 @@ hypervisor: ALL
 opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10
 opennebula_template:
   context:
-    service_id: "$SERVICE_ID"
-    oneapp_vnf_keepalived_eth0_skip: 'YES'
-    network: 'YES'
-    token: 'YES'
-    report_ready: 'YES'
-    ssh_public_key: "$USER[SSH_PUBLIC_KEY]"
-    one_service_airgapped: 'NO'
-    oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0"
-    oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0"
-    oneapp_vnf_haproxy_enabled: 'YES'
-    oneapp_vnf_haproxy_onegate_enabled: 'YES'
-    oneapp_vnf_haproxy_interfaces: "$ONEAPP_VNF_HAPROXY_INTERFACES"
-    oneapp_vnf_haproxy_refresh_rate: "$ONEAPP_VNF_HAPROXY_REFRESH_RATE"
-    oneapp_vnf_haproxy_lb0_ip: "$ONEAPP_VNF_HAPROXY_LB0_IP"
-    oneapp_vnf_haproxy_lb0_port: "$ONEAPP_VNF_HAPROXY_LB0_PORT"
-    oneapp_vnf_haproxy_lb1_ip: "$ONEAPP_VNF_HAPROXY_LB1_IP"
-    oneapp_vnf_haproxy_lb1_port: "$ONEAPP_VNF_HAPROXY_LB1_PORT"
-    oneapp_vnf_haproxy_lb2_ip: "$ONEAPP_VNF_HAPROXY_LB2_IP"
-    oneapp_vnf_haproxy_lb2_port: "$ONEAPP_VNF_HAPROXY_LB2_PORT"
-    oneapp_vnf_haproxy_lb3_ip: "$ONEAPP_VNF_HAPROXY_LB3_IP"
-    oneapp_vnf_haproxy_lb3_port: "$ONEAPP_VNF_HAPROXY_LB3_PORT"
-    oneapp_vnf_dns_enabled: "$ONEAPP_VNF_DNS_ENABLED"
-    oneapp_vnf_dns_interfaces: "$ONEAPP_VNF_DNS_INTERFACES"
-    oneapp_vnf_dns_nameservers: "$ONEAPP_VNF_DNS_NAMESERVERS"
-    oneapp_vnf_dns_use_rootservers: 'NO'
-    oneapp_vnf_nat4_enabled: "$ONEAPP_VNF_NAT4_ENABLED"
-    oneapp_vnf_nat4_interfaces_out: "$ONEAPP_VNF_NAT4_INTERFACES_OUT"
-    oneapp_vnf_router4_enabled: "$ONEAPP_VNF_ROUTER4_ENABLED"
-    oneapp_vnf_router4_interfaces: "$ONEAPP_VNF_ROUTER4_INTERFACES"
+    SERVICE_ID: "$SERVICE_ID"
+    ONEAPP_VNF_KEEPALIVED_ETH0_SKIP: "YES"
+    NETWORK: "YES"
+    TOKEN: "YES"
+    REPORT_READY: "YES"
+    SSH_PUBLIC_KEY: "$USER[SSH_PUBLIC_KEY]"
+    ONE_SERVICE_AIRGAPPED: "NO"
+    ONEAPP_VROUTER_ETH0_VIP0: "$ONEAPP_VROUTER_ETH0_VIP0"
+    ONEAPP_VROUTER_ETH1_VIP0: "$ONEAPP_VROUTER_ETH1_VIP0"
+    ONEAPP_VNF_HAPROXY_ENABLED: "YES"
+    ONEAPP_VNF_HAPROXY_ONEGATE_ENABLED: "YES"
+    ONEAPP_VNF_HAPROXY_INTERFACES: "$ONEAPP_VNF_HAPROXY_INTERFACES"
+    ONEAPP_VNF_HAPROXY_REFRESH_RATE: "$ONEAPP_VNF_HAPROXY_REFRESH_RATE"
+    ONEAPP_VNF_HAPROXY_LB0_IP: "$ONEAPP_VNF_HAPROXY_LB0_IP"
+    ONEAPP_VNF_HAPROXY_LB0_PORT: "$ONEAPP_VNF_HAPROXY_LB0_PORT"
+    ONEAPP_VNF_HAPROXY_LB1_IP: "$ONEAPP_VNF_HAPROXY_LB1_IP"
+    ONEAPP_VNF_HAPROXY_LB1_PORT: "$ONEAPP_VNF_HAPROXY_LB1_PORT"
+    ONEAPP_VNF_HAPROXY_LB2_IP: "$ONEAPP_VNF_HAPROXY_LB2_IP"
+    ONEAPP_VNF_HAPROXY_LB2_PORT: "$ONEAPP_VNF_HAPROXY_LB2_PORT"
+    ONEAPP_VNF_HAPROXY_LB3_IP: "$ONEAPP_VNF_HAPROXY_LB3_IP"
+    ONEAPP_VNF_HAPROXY_LB3_PORT: "$ONEAPP_VNF_HAPROXY_LB3_PORT"
+    ONEAPP_VNF_DNS_ENABLED: "$ONEAPP_VNF_DNS_ENABLED"
+    ONEAPP_VNF_DNS_INTERFACES: "$ONEAPP_VNF_DNS_INTERFACES"
+    ONEAPP_VNF_DNS_NAMESERVERS: "$ONEAPP_VNF_DNS_NAMESERVERS"
+    ONEAPP_VNF_DNS_USE_ROOTSERVERS: "NO"
+    ONEAPP_VNF_NAT4_ENABLED: "$ONEAPP_VNF_NAT4_ENABLED"
+    ONEAPP_VNF_NAT4_INTERFACES_OUT: "$ONEAPP_VNF_NAT4_INTERFACES_OUT"
+    ONEAPP_VNF_ROUTER4_ENABLED: "$ONEAPP_VNF_ROUTER4_ENABLED"
+    ONEAPP_VNF_ROUTER4_INTERFACES: "$ONEAPP_VNF_ROUTER4_INTERFACES"
   cpu: '1'
   graphics:
     listen: 0.0.0.0
diff --git a/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml b/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml
@@ -35,11 +35,13 @@ opennebula_template:
     ONEAPP_VROUTER_ETH1_VIP0: "$ONEAPP_VROUTER_ETH1_VIP0"
     ONEAPP_RKE2_SUPERVISOR_EP: "$ONEAPP_RKE2_SUPERVISOR_EP"
     ONEAPP_K8S_CONTROL_PLANE_EP: "$ONEAPP_K8S_CONTROL_PLANE_EP"
-    ONEAPP_K8S_MULTUS_ENABLED: "$ONEAPP_K8S_MULTUS_ENABLED"
-    ONEAPP_K8S_CNI_PLUGIN: "$ONEAPP_K8S_CNI_PLUGIN"
+    ONEAPP_K8S_CLUSTER_CIDR: "$ONEAPP_K8S_CLUSTER_CIDR"
+    ONEAPP_K8S_SERVICE_CIDR: "$ONEAPP_K8S_SERVICE_CIDR"
     ONEAPP_K8S_HTTP_PROXY: "$ONEAPP_K8S_HTTP_PROXY"
     ONEAPP_K8S_HTTPS_PROXY: "$ONEAPP_K8S_HTTPS_PROXY"
     ONEAPP_K8S_NO_PROXY: "$ONEAPP_K8S_NO_PROXY"
+    ONEAPP_K8S_MULTUS_ENABLED: "$ONEAPP_K8S_MULTUS_ENABLED"
+    ONEAPP_K8S_CNI_PLUGIN: "$ONEAPP_K8S_CNI_PLUGIN"
     ONEAPP_K8S_LONGHORN_ENABLED: "$ONEAPP_K8S_LONGHORN_ENABLED"
     ONEAPP_STORAGE_DEVICE: "$ONEAPP_STORAGE_DEVICE"
     ONEAPP_STORAGE_FILESYSTEM: "$ONEAPP_STORAGE_FILESYSTEM"
diff --git a/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml b/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml
@@ -75,8 +75,7 @@ opennebula_template:
     elasticity_policies: []
     scheduled_policies: []
   - name: master
-    parents:
-    - vnf
+    parents: [vnf]
     cardinality: 1
     min_vms: 1
     vm_template_contents: |
@@ -90,10 +89,12 @@ opennebula_template:
       ONEAPP_RKE2_SUPERVISOR_EP = "$ONEAPP_RKE2_SUPERVISOR_EP"
       ONEAPP_K8S_CONTROL_PLANE_EP = "$ONEAPP_K8S_CONTROL_PLANE_EP"
       ONEAPP_K8S_EXTRA_SANS = "$ONEAPP_K8S_EXTRA_SANS"
-      ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED = "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
+      ONEAPP_K8S_CLUSTER_CIDR = "$ONEAPP_K8S_CLUSTER_CIDR"
+      ONEAPP_K8S_SERVICE_CIDR = "$ONEAPP_K8S_SERVICE_CIDR"
       ONEAPP_K8S_HTTP_PROXY = "$ONEAPP_K8S_HTTP_PROXY"
       ONEAPP_K8S_HTTPS_PROXY = "$ONEAPP_K8S_HTTPS_PROXY"
       ONEAPP_K8S_NO_PROXY = "$ONEAPP_K8S_NO_PROXY"
+      ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED = "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
       ONEAPP_K8S_MULTUS_ENABLED = "$ONEAPP_K8S_MULTUS_ENABLED"
       ONEAPP_K8S_MULTUS_CONFIG = "$ONEAPP_K8S_MULTUS_CONFIG"
       ONEAPP_K8S_CNI_PLUGIN = "$ONEAPP_K8S_CNI_PLUGIN"
@@ -115,8 +116,7 @@ opennebula_template:
     elasticity_policies: []
     scheduled_policies: []
   - name: worker
-    parents:
-    - vnf
+    parents: [vnf]
     cardinality: 1
     vm_template_contents: |
       NIC = [
@@ -128,10 +128,12 @@ opennebula_template:
       ONEAPP_VROUTER_ETH1_VIP0 = "$ONEAPP_VROUTER_ETH1_VIP0"
       ONEAPP_RKE2_SUPERVISOR_EP = "$ONEAPP_RKE2_SUPERVISOR_EP"
       ONEAPP_K8S_CONTROL_PLANE_EP = "$ONEAPP_K8S_CONTROL_PLANE_EP"
-      ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED = "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
+      ONEAPP_K8S_CLUSTER_CIDR = "$ONEAPP_K8S_CLUSTER_CIDR"
+      ONEAPP_K8S_SERVICE_CIDR = "$ONEAPP_K8S_SERVICE_CIDR"
       ONEAPP_K8S_HTTP_PROXY = "$ONEAPP_K8S_HTTP_PROXY"
       ONEAPP_K8S_HTTPS_PROXY = "$ONEAPP_K8S_HTTPS_PROXY"
       ONEAPP_K8S_NO_PROXY = "$ONEAPP_K8S_NO_PROXY"
+      ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED = "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
       ONEAPP_K8S_MULTUS_ENABLED = "$ONEAPP_K8S_MULTUS_ENABLED"
       ONEAPP_K8S_CNI_PLUGIN = "$ONEAPP_K8S_CNI_PLUGIN"
       ONEAPP_K8S_LONGHORN_ENABLED = "$ONEAPP_K8S_LONGHORN_ENABLED"
@@ -148,8 +150,7 @@ opennebula_template:
     elasticity_policies: []
     scheduled_policies: []
   - name: storage
-    parents:
-    - vnf
+    parents: [vnf]
     cardinality: 0
     vm_template_contents: |
       NIC = [
@@ -161,6 +162,8 @@ opennebula_template:
       ONEAPP_VROUTER_ETH1_VIP0 = "$ONEAPP_VROUTER_ETH1_VIP0"
       ONEAPP_RKE2_SUPERVISOR_EP = "$ONEAPP_RKE2_SUPERVISOR_EP"
       ONEAPP_K8S_CONTROL_PLANE_EP = "$ONEAPP_K8S_CONTROL_PLANE_EP"
+      ONEAPP_K8S_CLUSTER_CIDR = "$ONEAPP_K8S_CLUSTER_CIDR"
+      ONEAPP_K8S_SERVICE_CIDR = "$ONEAPP_K8S_SERVICE_CIDR"
       ONEAPP_K8S_HTTP_PROXY = "$ONEAPP_K8S_HTTP_PROXY"
       ONEAPP_K8S_HTTPS_PROXY = "$ONEAPP_K8S_HTTPS_PROXY"
       ONEAPP_K8S_NO_PROXY = "$ONEAPP_K8S_NO_PROXY"
@@ -176,46 +179,47 @@ opennebula_template:
     elasticity_policies: []
     scheduled_policies: []
   networks:
-    Public: 'M|network|Public||id:'
-    Private: 'M|network|Private||id:'
+    Public: "M|network|Public||id:"
+    Private: "M|network|Private||id:"
   custom_attrs:
-    ONEAPP_VROUTER_ETH0_VIP0: O|text|Control Plane Endpoint VIP (IPv4)||
-    ONEAPP_VROUTER_ETH1_VIP0: O|text|Default Gateway VIP (IPv4)||
-    ONEAPP_RKE2_SUPERVISOR_EP: O|text|RKE2 Supervisor endpoint||ep0.eth0.vr:9345
-    ONEAPP_K8S_CONTROL_PLANE_EP: O|text|Control Plane endpoint||ep0.eth0.vr:6443
-    ONEAPP_K8S_EXTRA_SANS: O|text|ApiServer extra certificate SANs||localhost,127.0.0.1,ep0.eth0.vr,${vnf.TEMPLATE.CONTEXT.ETH0_IP}
-    ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED: O|boolean|Enables default RKE2 cloud controller||YES
-    ONEAPP_K8S_HTTP_PROXY: O|text|Defines HTTP Proxy for cluster traffic (default none)||
-    ONEAPP_K8S_HTTPS_PROXY: O|text|Defines HTTPS Proxy for cluster traffic (default none)||
-    ONEAPP_K8S_NO_PROXY: O|text|Defines non-proxied exceptions for cluster traffic
-      (only effective if http proxy is enabled)||
-    ONEAPP_K8S_MULTUS_ENABLED: O|boolean|Enable Multus||NO
-    ONEAPP_K8S_MULTUS_CONFIG: O|text64|Multus custom config (default none)||
-    ONEAPP_K8S_CNI_PLUGIN: O|list|CNI plugin supported by RKE2|canal,calico,cilium|cilium
-    ONEAPP_K8S_CNI_CONFIG: O|text64|CNI custom config (default none)||
-    ONEAPP_K8S_CILIUM_BGP_ENABLED: O|boolean|Enable BGP control plane for Cilium. It could conflict with other Service LB Controllers.||
-    ONEAPP_K8S_CILIUM_RANGE: O|text|Cilium LB IP CIDR. Only effective if `ONEAPP_K8S_CILIUM_BGP_ENABLED` is set to `YES` or undefined. (default none)||
-    ONEAPP_K8S_METALLB_ENABLED: O|boolean|Enable MetalLB||NO
-    ONEAPP_K8S_METALLB_CLASS: O|text|MetalLB Load Balancer Class name||metallb
-    ONEAPP_K8S_METALLB_RANGE: O|text|MetalLB IP range (default none)||
-    ONEAPP_K8S_METALLB_CONFIG: O|text64|MetalLB custom config (default none)||
-    ONEAPP_K8S_LONGHORN_ENABLED: O|boolean|Enable Longhorn||NO
-    ONEAPP_STORAGE_DEVICE: O|text|Storage device path||/dev/vdb
-    ONEAPP_STORAGE_FILESYSTEM: O|text|Storage device filesystem||xfs
-    ONEAPP_K8S_TRAEFIK_ENABLED: O|boolean|Enable Traefik||NO
-    ONEAPP_VNF_HAPROXY_INTERFACES: O|text|Interfaces to run Haproxy on||eth0
-    ONEAPP_VNF_HAPROXY_REFRESH_RATE: O|number|Haproxy refresh rate||30
-    ONEAPP_VNF_HAPROXY_LB0_PORT: O|number|HTTPS RKE2 Supervisor port||9345
-    ONEAPP_VNF_HAPROXY_LB1_PORT: O|number|HTTPS API Server port||6443
-    ONEAPP_VNF_HAPROXY_LB2_PORT: O|number|HTTPS ingress port||443
-    ONEAPP_VNF_HAPROXY_LB3_PORT: O|number|HTTP ingress port||80
-    ONEAPP_VNF_DNS_ENABLED: O|boolean|Enable DNS recursor||YES
-    ONEAPP_VNF_DNS_INTERFACES: O|text|DNS - Interfaces||eth1
-    ONEAPP_VNF_DNS_NAMESERVERS: O|text|DNS - Nameservers||1.1.1.1,8.8.8.8
-    ONEAPP_VNF_NAT4_ENABLED: O|boolean|Enable NAT||YES
-    ONEAPP_VNF_NAT4_INTERFACES_OUT: O|text|NAT - Outgoing Interfaces||eth0
-    ONEAPP_VNF_ROUTER4_ENABLED: O|boolean|Enable Router||YES
-    ONEAPP_VNF_ROUTER4_INTERFACES: O|text|Router - Interfaces||eth0,eth1
+    ONEAPP_VROUTER_ETH0_VIP0: "O|text|Control Plane Endpoint VIP (IPv4)||"
+    ONEAPP_VROUTER_ETH1_VIP0: "O|text|Default Gateway VIP (IPv4)||"
+    ONEAPP_RKE2_SUPERVISOR_EP: "O|text|RKE2 Supervisor endpoint||ep0.eth0.vr:9345"
+    ONEAPP_K8S_CONTROL_PLANE_EP: "O|text|Control Plane endpoint||ep0.eth0.vr:6443"
+    ONEAPP_K8S_EXTRA_SANS: "O|text|ApiServer extra certificate SANs||localhost,127.0.0.1,ep0.eth0.vr,${vnf.TEMPLATE.CONTEXT.ETH0_IP}"
+    ONEAPP_K8S_CLUSTER_CIDR: "O|text|Cluster subnet CIDR||10.42.0.0/16"
+    ONEAPP_K8S_SERVICE_CIDR: "O|text|Service subnet CIDR||10.43.0.0/16"
+    ONEAPP_K8S_HTTP_PROXY: "O|text|HTTP Proxy for cluster traffic (default none)||"
+    ONEAPP_K8S_HTTPS_PROXY: "O|text|HTTPS Proxy for cluster traffic (default none)||"
+    ONEAPP_K8S_NO_PROXY: "O|text|Non-proxied exceptions for cluster traffic (only effective if http proxy is enabled)||"
+    ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED: "O|boolean|Enables default RKE2 cloud controller||YES"
+    ONEAPP_K8S_MULTUS_ENABLED: "O|boolean|Enable Multus||NO"
+    ONEAPP_K8S_MULTUS_CONFIG: "O|text64|Multus custom config (default none)||"
+    ONEAPP_K8S_CNI_PLUGIN: "O|list|CNI plugin supported by RKE2|canal,calico,cilium|cilium"
+    ONEAPP_K8S_CNI_CONFIG: "O|text64|CNI custom config (default none)||"
+    ONEAPP_K8S_CILIUM_BGP_ENABLED: "O|boolean|Enable BGP control plane for Cilium. It could conflict with other Service LB Controllers.||"
+    ONEAPP_K8S_CILIUM_RANGE: "O|text|Cilium LB IP CIDR. Only effective if `ONEAPP_K8S_CILIUM_BGP_ENABLED` is set to `YES` or undefined. (default none)||"
+    ONEAPP_K8S_METALLB_ENABLED: "O|boolean|Enable MetalLB||NO"
+    ONEAPP_K8S_METALLB_CLASS: "O|text|MetalLB Load Balancer Class name||metallb"
+    ONEAPP_K8S_METALLB_RANGE: "O|text|MetalLB IP range (default none)||"
+    ONEAPP_K8S_METALLB_CONFIG: "O|text64|MetalLB custom config (default none)||"
+    ONEAPP_K8S_LONGHORN_ENABLED: "O|boolean|Enable Longhorn||NO"
+    ONEAPP_STORAGE_DEVICE: "O|text|Storage device path||/dev/vdb"
+    ONEAPP_STORAGE_FILESYSTEM: "O|text|Storage device filesystem||xfs"
+    ONEAPP_K8S_TRAEFIK_ENABLED: "O|boolean|Enable Traefik||NO"
+    ONEAPP_VNF_HAPROXY_INTERFACES: "O|text|Interfaces to run Haproxy on||eth0"
+    ONEAPP_VNF_HAPROXY_REFRESH_RATE: "O|number|Haproxy refresh rate||30"
+    ONEAPP_VNF_HAPROXY_LB0_PORT: "O|number|HTTPS RKE2 Supervisor port||9345"
+    ONEAPP_VNF_HAPROXY_LB1_PORT: "O|number|HTTPS API Server port||6443"
+    ONEAPP_VNF_HAPROXY_LB2_PORT: "O|number|HTTPS ingress port||443"
+    ONEAPP_VNF_HAPROXY_LB3_PORT: "O|number|HTTP ingress port||80"
+    ONEAPP_VNF_DNS_ENABLED: "O|boolean|Enable DNS recursor||YES"
+    ONEAPP_VNF_DNS_INTERFACES: "O|text|DNS - Interfaces||eth1"
+    ONEAPP_VNF_DNS_NAMESERVERS: "O|text|DNS - Nameservers||1.1.1.1,8.8.8.8"
+    ONEAPP_VNF_NAT4_ENABLED: "O|boolean|Enable NAT||YES"
+    ONEAPP_VNF_NAT4_INTERFACES_OUT: "O|text|NAT - Outgoing Interfaces||eth0"
+    ONEAPP_VNF_ROUTER4_ENABLED: "O|boolean|Enable Router||YES"
+    ONEAPP_VNF_ROUTER4_INTERFACES: "O|text|Router - Interfaces||eth0,eth1"
   ready_status_gate: true
 logo: kubernetes.png
 images: []
diff --git a/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml b/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml
@@ -36,6 +36,12 @@ opennebula_template:
     ONEAPP_RKE2_SUPERVISOR_EP: "$ONEAPP_RKE2_SUPERVISOR_EP"
     ONEAPP_K8S_CONTROL_PLANE_EP: "$ONEAPP_K8S_CONTROL_PLANE_EP"
     ONEAPP_K8S_EXTRA_SANS: "$ONEAPP_K8S_EXTRA_SANS"
+    ONEAPP_K8S_CLUSTER_CIDR: "$ONEAPP_K8S_CLUSTER_CIDR"
+    ONEAPP_K8S_SERVICE_CIDR: "$ONEAPP_K8S_SERVICE_CIDR"
+    ONEAPP_K8S_HTTP_PROXY: "$ONEAPP_K8S_HTTP_PROXY"
+    ONEAPP_K8S_HTTPS_PROXY: "$ONEAPP_K8S_HTTPS_PROXY"
+    ONEAPP_K8S_NO_PROXY: "$ONEAPP_K8S_NO_PROXY"
+    ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED: "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
     ONEAPP_K8S_MULTUS_ENABLED: "$ONEAPP_K8S_MULTUS_ENABLED"
     ONEAPP_K8S_MULTUS_CONFIG: "$ONEAPP_K8S_MULTUS_CONFIG"
     ONEAPP_K8S_CNI_PLUGIN: "$ONEAPP_K8S_CNI_PLUGIN"
@@ -48,10 +54,6 @@ opennebula_template:
     ONEAPP_K8S_METALLB_CONFIG: "$ONEAPP_K8S_METALLB_CONFIG"
     ONEAPP_K8S_METALLB_RANGE: "$ONEAPP_K8S_METALLB_RANGE"
     ONEAPP_K8S_TRAEFIK_ENABLED: "$ONEAPP_K8S_TRAEFIK_ENABLED"
-    ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED: "$ONEAPP_RKE2_CLOUD_CONTROLLER_ENABLED"
-    ONEAPP_K8S_HTTP_PROXY: "$ONEAPP_K8S_HTTP_PROXY"
-    ONEAPP_K8S_HTTPS_PROXY: "$ONEAPP_K8S_HTTPS_PROXY"
-    ONEAPP_K8S_NO_PROXY: "$ONEAPP_K8S_NO_PROXY"
     ONEAPP_VNF_HAPROXY_LB0_IP: "$ONEAPP_VNF_HAPROXY_LB0_IP"
     ONEAPP_VNF_HAPROXY_LB0_PORT: "$ONEAPP_VNF_HAPROXY_LB0_PORT"
     ONEAPP_VNF_HAPROXY_LB1_IP: "$ONEAPP_VNF_HAPROXY_LB1_IP"
diff --git a/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml b/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml
diff --git a/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml b/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml
