From 5dca1d6677ff5b4b6d403c57d5af33723945e3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Ram=C3=ADrez?= Date: Thu, 6 Mar 2025 09:10:02 +0100 Subject: [PATCH 1/3] M #-: [OneKE] Deletes confusing default values in ONEAPP_K8S_NO_PROXY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aleix Ramírez --- .../OneKE_1.31/2a902664-98ed-4e78-80b6-af97dfd75371.yaml | 4 ++-- .../OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml | 4 ++-- .../OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml | 4 ++-- .../OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml | 6 +++--- .../OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml | 4 ++-- .../OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml | 4 ++-- .../OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml | 6 +++--- .../OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml | 4 ++-- .../OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml | 4 ++-- 9 files changed, 20 insertions(+), 20 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 index 1065ffe..4d36f07 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 VM template for Master and Worker VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 diff --git a/appliances/OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml b/appliances/OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml index 925cc2b..976cb79 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 appliance OS disk. @@ -12,7 +12,7 @@ tags: - kubernetes - service format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: none os-arch: all hypervisor: ALL diff --git a/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml b/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml index be008c9..6421b94 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 VM template for Storage VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 diff --git a/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml b/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml index 6d0df38..d40ca7a 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 cluster for KVM hosts, @@ -25,7 +25,7 @@ tags: - oneflow - service - ubuntu -creation_time: 1735662515 +creation_time: 1741248349 os-id: Ubuntu os-release: 22.04 LTS os-arch: x86_64 @@ -188,7 +188,7 @@ opennebula_template: 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 + (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 diff --git a/appliances/OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml b/appliances/OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml index 119251f..b93399e 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 appliance Storage disk (empty). @@ -12,7 +12,7 @@ tags: - kubernetes - service format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: none os-arch: all hypervisor: ALL diff --git a/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml b/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml index 60cf707..b52efab 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 Airgapped VM template for Master and Worker VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 diff --git a/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml b/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml index ba46e20..d19a79e 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 Airgapped cluster for KVM and vCenter hosts, @@ -25,7 +25,7 @@ tags: - oneflow - service - ubuntu -creation_time: 1735662515 +creation_time: 1741248349 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 @@ -186,7 +186,7 @@ opennebula_template: 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" + (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" diff --git a/appliances/OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml b/appliances/OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml index ad28126..8b9cd49 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 Airgapped appliance OS disk. @@ -12,7 +12,7 @@ tags: - kubernetes - service format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: none os-arch: all hypervisor: ALL diff --git a/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml b/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml index b93445c..e4fa337 100644 --- 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.3-6.10.0-2-20241231 +version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- OneKE 1.31 Airgapped VM template for Storage VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1735662515 +creation_time: 1741248349 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 From 1a8be5e7e75ed33b3197b55040133b5796096f79 Mon Sep 17 00:00:00 2001 From: Michal Opala Date: Thu, 13 Mar 2025 21:06:54 +0100 Subject: [PATCH 2/3] F OpenNebula/one-apps#205: Add cluster/service CIDRs + cleanups - Add ONEAPPS_K8S_CLUSTER_CIDR parameter - Cleanup yaml syntax --- .../2a902664-98ed-4e78-80b6-af97dfd75371.yaml | 10 +- .../4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml | 58 ++-- .../98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml | 6 +- .../e73d2dda-1816-4f47-981f-72f1255f94ac.yaml | 98 +++--- .../88fbf221-418f-40cb-bde7-354716fe6512.yaml | 10 +- .../9378a80f-7556-46d2-8a89-43c8b03162e6.yaml | 294 +++++++++--------- .../d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml | 2 + 7 files changed, 248 insertions(+), 230 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 index 4d36f07..fbf77f8 100644 --- 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 index a182e7d..672471d 100644 --- 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 index 6421b94..d1ac0ad 100644 --- 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 index d40ca7a..fd2e7d5 100644 --- 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 index b52efab..715869a 100644 --- 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 index d19a79e..679d5b4 100644 --- a/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml +++ b/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml @@ -3,7 +3,7 @@ name: Service OneKE 1.31 Airgapped version: 1.31.3-6.10.0-2-20250311 publisher: OpenNebula Systems description: |- - [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 Airgapped cluster for KVM and vCenter hosts, + [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 Airgapped cluster for KVM hosts, orchestrated by [OneFlow](https://docs.opennebula.io/stable/management_and_operations/multivm_service_management/appflow_elasticity.html). @@ -19,7 +19,7 @@ description: |- - [OneKE 1.31 Airgapped](/appliance/88fbf221-418f-40cb-bde7-354716fe6512) - [OneKE 1.31 VNF](/appliance/4bea23af-09c2-4520-8f3a-ce902eb5157c) - [OneKE 1.31 Airgapped Storage](/appliance/d84d44f4-0e30-412a-a6f6-b1721bf7159e) -short_description: Multi-master Kubernetes 1.31 Airgapped cluster for KVM and vCenter hosts, orchestrated by OneFlow +short_description: Multi-master Kubernetes 1.31 Airgapped cluster for KVM hosts, orchestrated by OneFlow tags: - kubernetes - oneflow @@ -27,152 +27,157 @@ tags: - ubuntu creation_time: 1741248349 os-id: Ubuntu -os-release: "22.04 LTS" +os-release: 22.04 LTS os-arch: x86_64 hypervisor: ALL type: SERVICE_TEMPLATE -opennebula_version: >- - 6.2, 6.3, 6.4, 6.6, 6.8, 6.10 +opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10 roles: - vnf: "OneKE 1.31 VNF" - master: "OneKE 1.31 Airgapped" - worker: "OneKE 1.31 Airgapped" - storage: "OneKE 1.31 Airgapped Storage" + vnf: OneKE 1.31 VNF + master: OneKE 1.31 Airgapped + worker: OneKE 1.31 Airgapped + storage: OneKE 1.31 Airgapped Storage opennebula_template: name: OneKE 1.31 deployment: straight description: '' roles: - - name: vnf - cardinality: 1 - min_vms: 1 - vm_template_contents: | - NIC = [ - NAME = "NIC0", - NETWORK_ID = "$Public" ] - NIC = [ - NAME = "NIC1", - NETWORK_ID = "$Private" ] - ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" - ONEAPP_VROUTER_ETH1_VIP0 = "$ONEAPP_VROUTER_ETH1_VIP0" - 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_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" - ONEAPP_VNF_HAPROXY_LB1_IP = "" - ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" - ONEAPP_VNF_HAPROXY_LB2_IP = "" - ONEAPP_VNF_HAPROXY_LB2_PORT = "$ONEAPP_VNF_HAPROXY_LB2_PORT" - 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_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" - cooldown: 120 - elasticity_policies: [] - scheduled_policies: [] - - name: master - parents: [vnf] - cardinality: 1 - min_vms: 1 - vm_template_contents: | - NIC = [ - NAME = "NIC0", - NETWORK_ID = "$Private" ] - FALLBACK_GW = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" - FALLBACK_DNS = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" - ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" - 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_EXTRA_SANS = "$ONEAPP_K8S_EXTRA_SANS" - 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_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_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" - ONEAPP_K8S_METALLB_CLASS = "$ONEAPP_K8S_METALLB_CLASS" - 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_VNF_HAPROXY_LB0_IP = "" - ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" - ONEAPP_VNF_HAPROXY_LB1_IP = "" - ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" - ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" - cooldown: 120 - elasticity_policies: [] - scheduled_policies: [] - - name: worker - parents: [vnf] - cardinality: 1 - vm_template_contents: | - NIC = [ - NAME = "NIC0", - NETWORK_ID = "$Private" ] - FALLBACK_GW = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" - FALLBACK_DNS = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" - ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" - 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_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_K8S_METALLB_ENABLED = "$ONEAPP_K8S_METALLB_ENABLED" - ONEAPP_K8S_TRAEFIK_ENABLED = "$ONEAPP_K8S_TRAEFIK_ENABLED" - ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" - ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" - ONEAPP_VNF_HAPROXY_LB2_IP = "" - ONEAPP_VNF_HAPROXY_LB2_PORT = "$ONEAPP_VNF_HAPROXY_LB2_PORT" - ONEAPP_VNF_HAPROXY_LB3_IP = "" - ONEAPP_VNF_HAPROXY_LB3_PORT = "$ONEAPP_VNF_HAPROXY_LB3_PORT" - ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" - cooldown: 120 - elasticity_policies: [] - scheduled_policies: [] - - name: storage - parents: [vnf] - cardinality: 0 - vm_template_contents: | - NIC = [ - NAME = "NIC0", - NETWORK_ID = "$Private" ] - FALLBACK_GW = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" - FALLBACK_DNS = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" - ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" - 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_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" - ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" - ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" - ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" - cooldown: 120 - elasticity_policies: [] - scheduled_policies: [] + - name: vnf + cardinality: 1 + min_vms: 1 + vm_template_contents: | + NIC = [ + NAME = "NIC0", + NETWORK_ID = "$Public" ] + NIC = [ + NAME = "NIC1", + NETWORK_ID = "$Private" ] + ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" + ONEAPP_VROUTER_ETH1_VIP0 = "$ONEAPP_VROUTER_ETH1_VIP0" + 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_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" + ONEAPP_VNF_HAPROXY_LB1_IP = "" + ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" + ONEAPP_VNF_HAPROXY_LB2_IP = "" + ONEAPP_VNF_HAPROXY_LB2_PORT = "$ONEAPP_VNF_HAPROXY_LB2_PORT" + 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_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" + cooldown: 120 + elasticity_policies: [] + scheduled_policies: [] + - name: master + parents: [vnf] + cardinality: 1 + min_vms: 1 + vm_template_contents: | + NIC = [ + NAME = "NIC0", + NETWORK_ID = "$Private" ] + FALLBACK_GW = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" + FALLBACK_DNS = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" + ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" + 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_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" + ONEAPP_K8S_CNI_CONFIG = "$ONEAPP_K8S_CNI_CONFIG" + 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" + ONEAPP_K8S_METALLB_CLASS = "$ONEAPP_K8S_METALLB_CLASS" + 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_VNF_HAPROXY_LB0_IP = "" + ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" + ONEAPP_VNF_HAPROXY_LB1_IP = "" + ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" + ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" + cooldown: 120 + elasticity_policies: [] + scheduled_policies: [] + - name: worker + parents: [vnf] + cardinality: 1 + vm_template_contents: | + NIC = [ + NAME = "NIC0", + NETWORK_ID = "$Private" ] + FALLBACK_GW = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" + FALLBACK_DNS = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" + ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" + 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" + 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" + ONEAPP_K8S_METALLB_ENABLED = "$ONEAPP_K8S_METALLB_ENABLED" + ONEAPP_K8S_TRAEFIK_ENABLED = "$ONEAPP_K8S_TRAEFIK_ENABLED" + ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" + ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" + ONEAPP_VNF_HAPROXY_LB2_IP = "" + ONEAPP_VNF_HAPROXY_LB2_PORT = "$ONEAPP_VNF_HAPROXY_LB2_PORT" + ONEAPP_VNF_HAPROXY_LB3_IP = "" + ONEAPP_VNF_HAPROXY_LB3_PORT = "$ONEAPP_VNF_HAPROXY_LB3_PORT" + ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" + cooldown: 120 + elasticity_policies: [] + scheduled_policies: [] + - name: storage + parents: [vnf] + cardinality: 0 + vm_template_contents: | + NIC = [ + NAME = "NIC0", + NETWORK_ID = "$Private" ] + FALLBACK_GW = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" + FALLBACK_DNS = "${vnf.TEMPLATE.CONTEXT.ETH1_IP}" + ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" + 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" + 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" + ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT" + ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT" + ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" + cooldown: 120 + elasticity_policies: [] + scheduled_policies: [] networks: Public: "M|network|Public||id:" Private: "M|network|Private||id:" @@ -182,17 +187,18 @@ opennebula_template: 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_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 (default none)||" + 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.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml b/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml index e4fa337..e7e2714 100644 --- a/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml +++ b/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml @@ -35,6 +35,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_MULTUS_ENABLED: "$ONEAPP_K8S_MULTUS_ENABLED" ONEAPP_K8S_CNI_PLUGIN: "$ONEAPP_K8S_CNI_PLUGIN" ONEAPP_K8S_HTTP_PROXY: "$ONEAPP_K8S_HTTP_PROXY" From f11b97b138820f1a909651adf60daa019ea0c0fd Mon Sep 17 00:00:00 2001 From: Michal Opala Date: Fri, 14 Mar 2025 23:13:33 +0100 Subject: [PATCH 3/3] M #-: Update OneKE/a images (20250314) --- .../2a902664-98ed-4e78-80b6-af97dfd75371.yaml | 4 ++-- .../3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml | 10 +++++----- .../4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml | 4 ++-- .../98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml | 4 ++-- .../e73d2dda-1816-4f47-981f-72f1255f94ac.yaml | 4 ++-- .../eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml | 6 +++--- .../88fbf221-418f-40cb-bde7-354716fe6512.yaml | 4 ++-- .../9378a80f-7556-46d2-8a89-43c8b03162e6.yaml | 4 ++-- .../d1351342-44d9-454c-b2d8-38fae62296cc.yaml | 10 +++++----- .../d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml | 4 ++-- 10 files changed, 27 insertions(+), 27 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 index fbf77f8..1f447b1 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 VM template for Master and Worker VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 diff --git a/appliances/OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml b/appliances/OneKE_1.31/3f8627c5-9e05-4821-8ef1-20533ad9b7ba.yaml index 976cb79..d83afb5 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 appliance OS disk. @@ -12,18 +12,18 @@ tags: - kubernetes - service format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: none os-arch: all hypervisor: ALL opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10 images: - name: oneke_os - url: "https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.10.0-2-20241231.qcow2" + url: "https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.10.0-3-20250314.qcow2" type: OS dev_prefix: vd driver: qcow2 size: 26843545600 checksum: - md5: bdb4a8b987bf5d3277caf371458a05cd - sha256: 84ebbb695158bca6e493b28a383ab90569af3c00d52adf6c3ec9e0f1696ca816 + md5: bc1e1c3c4ebb955fb6b4ec0ea9964f60 + sha256: 9e99302664389f439e3d4d8404b2e36275786b53eeb48c4e058a142e449a1e77 diff --git a/appliances/OneKE_1.31/4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml b/appliances/OneKE_1.31/4bea23af-09c2-4520-8f3a-ce902eb5157c.yaml index 672471d..4db85a6 100644 --- 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.3-6.10.0-3-20250218 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- Appliance providing several Virtual Network Functions (routing, NAT, DNS, DHCP) @@ -14,7 +14,7 @@ tags: - service - vnf format: qcow2 -creation_time: 1739953178 +creation_time: 1741989310 os-id: Alpine os-release: '3.20' os-arch: x86_64 diff --git a/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml b/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml index d1ac0ad..268ca3a 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 VM template for Storage VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 diff --git a/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml b/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml index fd2e7d5..fec8604 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 cluster for KVM hosts, @@ -25,7 +25,7 @@ tags: - oneflow - service - ubuntu -creation_time: 1741248349 +creation_time: 1741989310 os-id: Ubuntu os-release: 22.04 LTS os-arch: x86_64 diff --git a/appliances/OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml b/appliances/OneKE_1.31/eb2558c9-9be8-4eff-8b41-c2e35a0d4e74.yaml index b93399e..3df554c 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 appliance Storage disk (empty). @@ -12,14 +12,14 @@ tags: - kubernetes - service format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: none os-arch: all hypervisor: ALL opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10 images: - name: oneke_storage - url: "https://d24fmfybwxpuhu.cloudfront.net/service_OneKE_storage-6.10.0-2-20241231.qcow2" + url: "https://d24fmfybwxpuhu.cloudfront.net/service_OneKE_storage-6.10.0-3-20250314.qcow2" type: OS dev_prefix: vd driver: qcow2 diff --git a/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml b/appliances/OneKE_1.31a/88fbf221-418f-40cb-bde7-354716fe6512.yaml index 715869a..ba5626b 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 Airgapped VM template for Master and Worker VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64 diff --git a/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml b/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml index 679d5b4..061eced 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.31 Airgapped cluster for KVM hosts, @@ -25,7 +25,7 @@ tags: - oneflow - service - ubuntu -creation_time: 1741248349 +creation_time: 1741989310 os-id: Ubuntu os-release: 22.04 LTS os-arch: x86_64 diff --git a/appliances/OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml b/appliances/OneKE_1.31a/d1351342-44d9-454c-b2d8-38fae62296cc.yaml index 8b9cd49..a45af3b 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 Airgapped appliance OS disk. @@ -12,7 +12,7 @@ tags: - kubernetes - service format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: none os-arch: all hypervisor: ALL @@ -20,11 +20,11 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8, 6.10 images: - name: oneke_os - url: "https://d24fmfybwxpuhu.cloudfront.net/service_OneKEa-6.10.0-2-20241231.qcow2" + url: "https://d24fmfybwxpuhu.cloudfront.net/service_OneKEa-6.10.0-3-20250314.qcow2" type: OS dev_prefix: vd driver: qcow2 size: 26843545600 checksum: - md5: c285e268b97b0a08d489bc0a975baa79 - sha256: a98d5657889c8f3f468c06ea7bed9c39546ebee1e070ea4ecc6f575afbe42720 + md5: 05e1206b16de6f2fd09ba80c682d428f + sha256: 21d92cb0b177bdb8b6e3db24d348b4dd756768a74d78357ab0870e0701d6af51 diff --git a/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml b/appliances/OneKE_1.31a/d84d44f4-0e30-412a-a6f6-b1721bf7159e.yaml index e7e2714..3b5c1ff 100644 --- 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.3-6.10.0-2-20250311 +version: 1.31.3-6.10.0-3-20250314 publisher: OpenNebula Systems description: |- OneKE 1.31 Airgapped VM template for Storage VMs. @@ -13,7 +13,7 @@ tags: - ubuntu type: VMTEMPLATE format: qcow2 -creation_time: 1741248349 +creation_time: 1741989310 os-id: Ubuntu os-release: "22.04 LTS" os-arch: x86_64