F OpenNebula/one#6272,OpenNebula/one#6273: OneKE refactor

- Update RKE2 to v1.27.2+rke2r1
- Make Longhorn, MetalLB, Traefik optional
- Make CNI customizable
- Add Multus
- Add range config for Cilium LB

appliances/OneKE_1.27/0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml

@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.27
-version: 1.27.1-6.6.1-1.20230702
+version: 1.27.2-6.6.1-1.20230721
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27 VM template for Master and Worker VMs.
@@ -31,8 +31,16 @@ opennebula_template:
     oneapp_vnf_haproxy_lb2_port: "$ONEAPP_VNF_HAPROXY_LB2_PORT"
     oneapp_vnf_haproxy_lb3_port: "$ONEAPP_VNF_HAPROXY_LB3_PORT"
     oneapp_k8s_extra_sans: "$ONEAPP_K8S_EXTRA_SANS"
-    oneapp_k8s_loadbalancer_config: "$ONEAPP_K8S_LOADBALANCER_CONFIG"
-    oneapp_k8s_loadbalancer_range: "$ONEAPP_K8S_LOADBALANCER_RANGE"
+    oneapp_k8s_multus_enabled: "$ONEAPP_K8S_MULTUS_ENABLED"
+    oneapp_k8s_multus_config: "$ONEAPP_K8S_MULTUS_CONFIG"
+    oneapp_k8s_cni_plugin: "$ONEAPP_K8S_CNI_PLUGIN"
+    oneapp_k8s_cni_config: "$ONEAPP_K8S_CNI_CONFIG"
+    oneapp_k8s_cilium_range: "$ONEAPP_K8S_CILIUM_RANGE"
+    oneapp_k8s_longhorn_enabled: "$ONEAPP_K8S_LONGHORN_ENABLED"
+    oneapp_k8s_metallb_enabled: "$ONEAPP_K8S_METALLB_ENABLED"
+    oneapp_k8s_metallb_config: "$ONEAPP_K8S_METALLB_CONFIG"
+    oneapp_k8s_metallb_range: "$ONEAPP_K8S_METALLB_RANGE"
+    oneapp_k8s_traefik_enabled: "$ONEAPP_K8S_TRAEFIK_ENABLED"
     ssh_public_key: "$USER[SSH_PUBLIC_KEY]"
   cpu: "2"
   vcpu: "2"

appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml

@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.27 Storage disk
-version: 1.27.1-6.6.1-1.20230702
+version: 1.27.2-6.6.1-1.20230721
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27 appliance Storage disk (empty).
@@ -20,7 +20,7 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6
 images:
 - name: oneke_storage
-  url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE_storage-6.6.1-1.20230702.qcow2
+  url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE_storage-6.6.1-1.20230721.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2

appliances/OneKE_1.27/7c82d610-73f1-47d1-a85a-d799e00c631e.yaml

@@ -1,6 +1,6 @@
 ---
 name: Service OneKE 1.27
-version: 1.27.1-6.6.1-1.20230702
+version: 1.27.2-6.6.1-1.20230721
 publisher: OpenNebula Systems
 description: |-
   [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.27 cluster for KVM and vCenter hosts,
@@ -57,7 +57,7 @@ opennebula_template: '{
       "parents": ["vnf"],
       "cardinality": 1,
       "min_vms": 1,
-      "vm_template_contents": "NIC=[NAME=\"NIC0\",NETWORK_ID=\"$Private\"]\nONEAPP_VROUTER_ETH0_VIP0=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VROUTER_ETH1_VIP0=\"$ONEAPP_VROUTER_ETH1_VIP0\"\nONEAPP_K8S_EXTRA_SANS=\"$ONEAPP_K8S_EXTRA_SANS\"\nONEAPP_K8S_LOADBALANCER_RANGE=\"$ONEAPP_K8S_LOADBALANCER_RANGE\"\nONEAPP_K8S_LOADBALANCER_CONFIG=\"$ONEAPP_K8S_LOADBALANCER_CONFIG\"\n",
+      "vm_template_contents": "NIC=[NAME=\"NIC0\",NETWORK_ID=\"$Private\"]\nONEAPP_VROUTER_ETH0_VIP0=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VROUTER_ETH1_VIP0=\"$ONEAPP_VROUTER_ETH1_VIP0\"\nONEAPP_K8S_EXTRA_SANS=\"$ONEAPP_K8S_EXTRA_SANS\"\nONEAPP_K8S_MULTUS_ENABLED=\"$ONEAPP_K8S_MULTUS_ENABLED\"\nONEAPP_K8S_MULTUS_CONFIG=\"$ONEAPP_K8S_MULTUS_CONFIG\"\nONEAPP_K8S_CNI_PLUGIN=\"$ONEAPP_K8S_CNI_PLUGIN\"\nONEAPP_K8S_CNI_CONFIG=\"$ONEAPP_K8S_CNI_CONFIG\"\nONEAPP_K8S_CILIUM_RANGE=\"$ONEAPP_K8S_CILIUM_RANGE\"\nONEAPP_K8S_LONGHORN_ENABLED=\"$ONEAPP_K8S_LONGHORN_ENABLED\"\nONEAPP_K8S_METALLB_ENABLED=\"$ONEAPP_K8S_METALLB_ENABLED\"\nONEAPP_K8S_METALLB_CONFIG=\"$ONEAPP_K8S_METALLB_CONFIG\"\nONEAPP_K8S_METALLB_RANGE=\"$ONEAPP_K8S_METALLB_RANGE\"\nONEAPP_K8S_TRAEFIK_ENABLED=\"$ONEAPP_K8S_TRAEFIK_ENABLED\"\n",
       "cooldown": 120,
       "elasticity_policies": [],
       "scheduled_policies": []
@@ -66,7 +66,7 @@ opennebula_template: '{
       "name": "worker",
       "parents": ["vnf"],
       "cardinality": 1,
-      "vm_template_contents": "NIC=[NAME=\"NIC0\",NETWORK_ID=\"$Private\"]\nONEAPP_VROUTER_ETH0_VIP0=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VROUTER_ETH1_VIP0=\"$ONEAPP_VROUTER_ETH1_VIP0\"\nONEAPP_VNF_HAPROXY_LB2_IP=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VNF_HAPROXY_LB2_PORT=\"$ONEAPP_VNF_HAPROXY_LB2_PORT\"\nONEAPP_VNF_HAPROXY_LB3_IP=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VNF_HAPROXY_LB3_PORT=\"$ONEAPP_VNF_HAPROXY_LB3_PORT\"\n",
+      "vm_template_contents": "NIC=[NAME=\"NIC0\",NETWORK_ID=\"$Private\"]\nONEAPP_VROUTER_ETH0_VIP0=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VROUTER_ETH1_VIP0=\"$ONEAPP_VROUTER_ETH1_VIP0\"\nONEAPP_K8S_LONGHORN_ENABLED=\"$ONEAPP_K8S_LONGHORN_ENABLED\"\nONEAPP_K8S_METALLB_ENABLED=\"$ONEAPP_K8S_METALLB_ENABLED\"\nONEAPP_K8S_TRAEFIK_ENABLED=\"$ONEAPP_K8S_TRAEFIK_ENABLED\"\nONEAPP_VNF_HAPROXY_LB2_IP=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VNF_HAPROXY_LB2_PORT=\"$ONEAPP_VNF_HAPROXY_LB2_PORT\"\nONEAPP_VNF_HAPROXY_LB3_IP=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VNF_HAPROXY_LB3_PORT=\"$ONEAPP_VNF_HAPROXY_LB3_PORT\"\n",
       "cooldown": 120,
       "elasticity_policies": [],
       "scheduled_policies": []
@@ -75,8 +75,7 @@ opennebula_template: '{
       "name": "storage",
       "parents": ["vnf"],
       "cardinality": 1,
-      "min_vms": 1,
-      "vm_template_contents": "NIC=[NAME=\"NIC0\",NETWORK_ID=\"$Private\"]\nONEAPP_VROUTER_ETH0_VIP0=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VROUTER_ETH1_VIP0=\"$ONEAPP_VROUTER_ETH1_VIP0\"\nONEAPP_STORAGE_DEVICE=\"$ONEAPP_STORAGE_DEVICE\"\nONEAPP_STORAGE_FILESYSTEM=\"$ONEAPP_STORAGE_FILESYSTEM\"\n",
+      "vm_template_contents": "NIC=[NAME=\"NIC0\",NETWORK_ID=\"$Private\"]\nONEAPP_VROUTER_ETH0_VIP0=\"$ONEAPP_VROUTER_ETH0_VIP0\"\nONEAPP_VROUTER_ETH1_VIP0=\"$ONEAPP_VROUTER_ETH1_VIP0\"\nONEAPP_K8S_LONGHORN_ENABLED=\"$ONEAPP_K8S_LONGHORN_ENABLED\"\nONEAPP_STORAGE_DEVICE=\"$ONEAPP_STORAGE_DEVICE\"\nONEAPP_STORAGE_FILESYSTEM=\"$ONEAPP_STORAGE_FILESYSTEM\"\n",
       "cooldown": 120,
       "elasticity_policies": [],
       "scheduled_policies": []
@@ -90,8 +89,16 @@ opennebula_template: '{
     "ONEAPP_VROUTER_ETH0_VIP0": "M|text|Control Plane Endpoint VIP (IPv4)||",
     "ONEAPP_VROUTER_ETH1_VIP0": "O|text|Default Gateway VIP (IPv4)||",
     "ONEAPP_K8S_EXTRA_SANS": "O|text|ApiServer extra certificate SANs||localhost,127.0.0.1",
-    "ONEAPP_K8S_LOADBALANCER_RANGE": "O|text|MetalLB IP range (default none)||",
-    "ONEAPP_K8S_LOADBALANCER_CONFIG": "O|text64|MetalLB custom config (default none)||",
+    "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|text|CNI plugin supported by RKE2||cilium",
+    "ONEAPP_K8S_CNI_CONFIG": "O|text64|CNI custom config (default none)||",
+    "ONEAPP_K8S_CILIUM_RANGE": "O|text|Cilium LB IP CIDR (default none)||",
+    "ONEAPP_K8S_LONGHORN_ENABLED": "O|boolean|Enable Longhorn||NO",
+    "ONEAPP_K8S_METALLB_ENABLED": "O|boolean|Enable MetalLB||NO",
+    "ONEAPP_K8S_METALLB_RANGE": "O|text|MetalLB IP range (default none)||",
+    "ONEAPP_K8S_METALLB_CONFIG": "O|text64|MetalLB custom config (default none)||",
+    "ONEAPP_K8S_TRAEFIK_ENABLED": "O|boolean|Enable Traefik||NO",
     "ONEAPP_STORAGE_DEVICE": "M|text|Storage device path||/dev/vdb",
     "ONEAPP_STORAGE_FILESYSTEM": "O|text|Storage device filesystem||xfs",
     "ONEAPP_VNF_NAT4_ENABLED": "O|boolean|Enable NAT||YES",

appliances/OneKE_1.27/8285d732-0741-4623-ba9e-4eacd2421e91.yaml

@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.27 VNF
-version: 1.27.1-6.6.1-1.20230702
+version: 1.27.2-6.6.1-1.20230721
 publisher: OpenNebula Systems
 description: |-
   Appliance providing several Virtual Network Functions (routing, NAT, DNS, DHCP)

appliances/OneKE_1.27/b33066eb-03ae-4338-9f97-2189457f6cb3.yaml

@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.27 OS disk
-version: 1.27.1-6.6.1-1.20230702
+version: 1.27.2-6.6.1-1.20230721
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27 appliance OS disk.
@@ -20,11 +20,11 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6
 images:
 - name: oneke_os
-  url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.6.1-1.20230702.qcow2
+  url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.6.1-1.20230721.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2
   size: 21474836480
   checksum:
-    md5: a981a98b588250b5560f19c5428693bd
-    sha256: 126dee8d08af218c7477e92c5d63f1c5c8c974a5755a56d2fb70f49364697141
+    md5: 42a010124f631e3436f150567b51995d
+    sha256: 8ac3dc16851e4be7eedca00eeb24be182dbaeeef653c8b978ce84c88464ab174

appliances/OneKE_1.27/c76926e6-4c0a-499f-848f-716b3164bf31.yaml

@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.27 Storage
-version: 1.27.1-6.6.1-1.20230702
+version: 1.27.2-6.6.1-1.20230721
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27 VM template for Storage VMs.
@@ -28,6 +28,7 @@ opennebula_template:
     token: "YES"
     oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0"
     oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0"
+    oneapp_k8s_longhorn_enabled: "$ONEAPP_K8S_LONGHORN_ENABLED"
     oneapp_storage_device: "$ONEAPP_STORAGE_DEVICE"
     oneapp_storage_filesystem: "$ONEAPP_STORAGE_FILESYSTEM"
     oneapp_storage_mountpoint: "/var/lib/longhorn"