Add fixes for OneKE 1.31 templates

OpenNebula · Dec 18, 2024 · 31ce7d3 · 31ce7d3
1 parent 6ffb84a
commit 31ce7d3
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 32 deletions.
diff --git a/appliances/OneKE_1.31/2a902664-98ed-4e78-80b6-af97dfd75371.yaml b/appliances/OneKE_1.31/2a902664-98ed-4e78-80b6-af97dfd75371.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31
-version: 1.31.2-6.10.1-1-20241205
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 VM template for Master and Worker VMs.
@@ -40,7 +40,7 @@ opennebula_template:
     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_ENABLE_BGP : "$ONEAPP_K8S_CILIUM_ENABLE_BGP"
+    ONEAPP_K8S_CILIUM_BGP_ENABLED : "$ONEAPP_K8S_CILIUM_BGP_ENABLED"
     ONEAPP_K8S_CILIUM_RANGE: "$ONEAPP_K8S_CILIUM_RANGE"
     ONEAPP_K8S_LONGHORN_ENABLED: "$ONEAPP_K8S_LONGHORN_ENABLED"
     ONEAPP_K8S_METALLB_ENABLED: "$ONEAPP_K8S_METALLB_ENABLED"

diff --git a/appliances/OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml b/appliances/OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 OS disk
-version: 1.31.2-6.10.1-1-20241205
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 appliance OS disk.
@@ -19,7 +19,7 @@ hypervisor: ALL
 opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10
 images:
 - name: oneke_os
-  url: http://services:9999/images/service_OneKE.qcow2
+  url: http://192.168.150.1:8080/service_OneKE.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2

diff --git a/appliances/OneKE_1.31/4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml b/appliances/OneKE_1.31/4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 VNF
-version: 1.31.2-6.10.1-1-20241205
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   Appliance providing several Virtual Network Functions (routing, NAT, DNS, DHCP)
@@ -66,7 +66,7 @@ opennebula_template:
 logo: router.png
 images:
 - name: oneke_vnf
-  url: http://services/images/service_VRouter.qcow2
+  url: http://192.168.150.1:8080/service_VRouter.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2

diff --git a/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml b/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 Storage
-version: 1.31.2-6.10.1-1-20241205
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 VM template for Storage VMs.

diff --git a/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml b/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml
@@ -1,6 +1,6 @@
 ---
 name: Service OneKE 1.31
-version: 1.31.2-6.10.1-1-20241205
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 cluster for KVM hosts,
@@ -19,8 +19,7 @@ description: |-
   - [OneKE 1.31](/appliance/2a902664-98ed-4e78-80b6-af97dfd75371)
   - [OneKE 1.31 VNF](/appliance/4bea23af-09c2-4520-8f3a-ce902eb5157c)
   - [OneKE 1.31 Storage](/appliance/98df67fd-6dbd-49e3-a99d-9b8d8519c418)
-short_description: Multi-master Kubernetes 1.31 cluster for KVM hosts, orchestrated
-  by OneFlow
+short_description: Multi-master Kubernetes 1.31 cluster for KVM hosts, orchestrated by OneFlow
 tags:
 - kubernetes
 - oneflow
@@ -99,7 +98,7 @@ opennebula_template:
       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_ENABLE_BGP = "$ONEAPP_K8S_CILIUM_ENABLE_BGP"
+      ONEAPP_K8S_CILIUM_BGP_ENABLED = "$ONEAPP_K8S_CILIUM_BGP_ENABLED"
       ONEAPP_K8S_CILIUM_RANGE = "$ONEAPP_K8S_CILIUM_RANGE"
       ONEAPP_K8S_LONGHORN_ENABLED = "$ONEAPP_K8S_LONGHORN_ENABLED"
       ONEAPP_K8S_METALLB_ENABLED = "$ONEAPP_K8S_METALLB_ENABLED"
@@ -187,20 +186,16 @@ opennebula_template:
     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_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 jhttp proxy is enabled)||localhost,127.0.0.1/32,$ONEAPP_RKE2_SUPERVISOR_EP,$ONEAPP_K8S_CONTROL_PLANE_EP
     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_ENABLE_BGP: 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_ENABLE_BGP`
-      is set to `YES` or undefined. (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)||

diff --git a/appliances/OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml b/appliances/OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 Storage disk
-version: 1.31.2-6.10.1-1-20241205
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 appliance Storage disk (empty).

diff --git a/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml b/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 Airgapped
-version: 1.31.4-6.10.0-1-20240510 #TODO 1.29.4-6.10.0-1-20240510
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 Airgapped VM template for Master and Worker VMs.
@@ -40,7 +40,7 @@ opennebula_template:
     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_ENABLE_BGP: "$ONEAPP_K8S_CILIUM_ENABLE_BGP"
+    ONEAPP_K8S_CILIUM_BGP_ENABLED: "$ONEAPP_K8S_CILIUM_BGP_ENABLED"
     ONEAPP_K8S_CILIUM_RANGE: "$ONEAPP_K8S_CILIUM_RANGE"
     ONEAPP_K8S_LONGHORN_ENABLED: "$ONEAPP_K8S_LONGHORN_ENABLED"
     ONEAPP_K8S_METALLB_ENABLED: "$ONEAPP_K8S_METALLB_ENABLED"

diff --git a/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml b/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml
@@ -1,6 +1,6 @@
 ---
 name: Service OneKE 1.31 Airgapped
-version: 1.31.4-6.10.0-1-20240510 #TODO: 1.31.4-6.10.0-1-20240510
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 Airgapped cluster for KVM and vCenter hosts,
@@ -98,7 +98,7 @@ opennebula_template:
         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_ENABLE_BGP = "$ONEAPP_K8S_CILIUM_ENABLE_BGP"
+        ONEAPP_K8S_CILIUM_BGP_ENABLED = "$ONEAPP_K8S_CILIUM_BGP_ENABLED"
         ONEAPP_K8S_CILIUM_RANGE = "$ONEAPP_K8S_CILIUM_RANGE"
         ONEAPP_K8S_LONGHORN_ENABLED = "$ONEAPP_K8S_LONGHORN_ENABLED"
         ONEAPP_K8S_METALLB_ENABLED = "$ONEAPP_K8S_METALLB_ENABLED"
@@ -184,18 +184,15 @@ opennebula_template:
     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_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 jhttp proxy is enabled)||localhost,127.0.0.1/32,$ONEAPP_RKE2_SUPERVISOR_EP,$ONEAPP_K8S_CONTROL_PLANE_EP"
     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_ENABLE_BGP: "O|boolean|Enable BGP control plane for Cilium. It
-      could conflict with other Service LB Controllers.||"
+    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 (default none)||"
     ONEAPP_K8S_METALLB_ENABLED: "O|boolean|Enable MetalLB||NO"
     ONEAPP_K8S_METALLB_CLASS: "O|text|MetalLB Load Balancer Class name||metallb"

diff --git a/appliances/OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml b/appliances/OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 Airgapped OS disk
-version: 1.31.4-6.10.0-1-20240510 #TODO 1.29.4-6.10.0-1-20240510
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 Airgapped appliance OS disk.

diff --git a/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml b/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml
@@ -1,6 +1,6 @@
 ---
 name: OneKE 1.31 Airgapped Storage
-version: 1.31.4-6.10.0-1-20240510 #TODO 1.29.4-6.10.0-1-20240510
+version: 1.31.3-6.10.0-2-20241219
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.31 Airgapped VM template for Storage VMs.
@@ -37,6 +37,10 @@ opennebula_template:
     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_CLOUD_CONTROLLER_ENABLED: "$ONEAPP_K8S_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_K8S_LONGHORN_ENABLED: "$ONEAPP_K8S_LONGHORN_ENABLED"
     ONEAPP_STORAGE_DEVICE: "$ONEAPP_STORAGE_DEVICE"
     ONEAPP_STORAGE_FILESYSTEM: "$ONEAPP_STORAGE_FILESYSTEM"