From f0d55a999a9e3f249456d9f85dec6a552390ba0b Mon Sep 17 00:00:00 2001 From: Michal Opala Date: Fri, 19 Jan 2024 17:18:55 +0100 Subject: [PATCH] F #-: Adjust OneKE 1.27 to use the new VR (#88) --- .../0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml | 52 ++++++++------- .../1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml | 2 +- .../7c82d610-73f1-47d1-a85a-d799e00c631e.yaml | 59 +++++++++++------ .../8285d732-0741-4623-ba9e-4eacd2421e91.yaml | 63 +++++++++---------- .../b33066eb-03ae-4338-9f97-2189457f6cb3.yaml | 10 +-- .../c76926e6-4c0a-499f-848f-716b3164bf31.yaml | 34 +++++----- .../157b4f75-a216-4b42-b58e-2a21e95d09ec.yaml | 53 +++++++++------- .../2353fb4f-bd0f-43d1-a0f5-fac8e77ea158.yaml | 10 +-- .../6f97fe15-0d4f-4a13-9cec-1766cd2bf225.yaml | 59 +++++++++++------ .../b963e931-1ddc-4976-bf6a-f304a53ab19c.yaml | 35 ++++++----- 10 files changed, 223 insertions(+), 154 deletions(-) diff --git a/appliances/OneKE_1.27/0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml b/appliances/OneKE_1.27/0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml index 5e0abf7..e500e2f 100644 --- a/appliances/OneKE_1.27/0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml +++ b/appliances/OneKE_1.27/0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27 -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27 VM template for Master and Worker VMs. @@ -22,26 +22,36 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 opennebula_template: context: - grow_fs: "/" - network: "YES" - report_ready: "YES" - token: "YES" - oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0" - oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0" - 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_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]" + GROW_FS: "/" + 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_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_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" + 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" cpu: "2" vcpu: "2" graphics: diff --git a/appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml b/appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml index 25cc042..1f11209 100644 --- a/appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml +++ b/appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27 Storage disk -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27 appliance Storage disk (empty). diff --git a/appliances/OneKE_1.27/7c82d610-73f1-47d1-a85a-d799e00c631e.yaml b/appliances/OneKE_1.27/7c82d610-73f1-47d1-a85a-d799e00c631e.yaml index 597b793..ab8c570 100644 --- a/appliances/OneKE_1.27/7c82d610-73f1-47d1-a85a-d799e00c631e.yaml +++ b/appliances/OneKE_1.27/7c82d610-73f1-47d1-a85a-d799e00c631e.yaml @@ -1,6 +1,6 @@ --- name: Service OneKE 1.27 -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.27 cluster for KVM and vCenter hosts, @@ -55,22 +55,22 @@ opennebula_template: NETWORK_ID = "$Private" ] ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" ONEAPP_VROUTER_ETH1_VIP0 = "$ONEAPP_VROUTER_ETH1_VIP0" - 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" ONEAPP_VNF_HAPROXY_INTERFACES = "$ONEAPP_VNF_HAPROXY_INTERFACES" ONEAPP_VNF_HAPROXY_REFRESH_RATE = "$ONEAPP_VNF_HAPROXY_REFRESH_RATE" - ONEAPP_VNF_HAPROXY_CONFIG = "$ONEAPP_VNF_HAPROXY_CONFIG" - ONEAPP_VNF_HAPROXY_LB0_IP = "$ONEAPP_VROUTER_ETH0_VIP0" - ONEAPP_VNF_HAPROXY_LB0_PORT = "9345" - ONEAPP_VNF_HAPROXY_LB1_IP = "$ONEAPP_VROUTER_ETH0_VIP0" - ONEAPP_VNF_HAPROXY_LB1_PORT = "6443" - ONEAPP_VNF_HAPROXY_LB2_IP = "$ONEAPP_VROUTER_ETH0_VIP0" + 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_VROUTER_ETH0_VIP0" + ONEAPP_VNF_HAPROXY_LB3_IP = "" ONEAPP_VNF_HAPROXY_LB3_PORT = "$ONEAPP_VNF_HAPROXY_LB3_PORT" - ONEAPP_VNF_KEEPALIVED_VRID = "$ONEAPP_VNF_KEEPALIVED_VRID" + ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" + ONEAPP_VNF_DNS_INTERFACES = "$ONEAPP_VNF_DNS_INTERFACES" + 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: [] @@ -84,6 +84,8 @@ opennebula_template: NETWORK_ID = "$Private" ] 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_MULTUS_ENABLED = "$ONEAPP_K8S_MULTUS_ENABLED" ONEAPP_K8S_MULTUS_CONFIG = "$ONEAPP_K8S_MULTUS_CONFIG" @@ -95,6 +97,11 @@ 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_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: [] @@ -107,15 +114,20 @@ opennebula_template: NETWORK_ID = "$Private" ] 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_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_LB2_IP = "$ONEAPP_VROUTER_ETH0_VIP0" + 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_VROUTER_ETH0_VIP0" + 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: [] @@ -128,11 +140,16 @@ opennebula_template: NETWORK_ID = "$Private" ] 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_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: [] @@ -140,9 +157,11 @@ opennebula_template: Public: "M|network|Public||id:" Private: "M|network|Private||id:" custom_attrs: - ONEAPP_VROUTER_ETH0_VIP0: "M|text|Control Plane Endpoint VIP (IPv4)||" + ONEAPP_VROUTER_ETH0_VIP0: "O|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_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" 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" @@ -157,14 +176,16 @@ opennebula_template: 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_CONFIG: "O|text|Custom Haproxy config (default none)||" + 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_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_VNF_KEEPALIVED_VRID: "O|number|Global vrouter id (1-255)||1" ready_status_gate: true logo: kubernetes.png images: [] diff --git a/appliances/OneKE_1.27/8285d732-0741-4623-ba9e-4eacd2421e91.yaml b/appliances/OneKE_1.27/8285d732-0741-4623-ba9e-4eacd2421e91.yaml index 1411a34..79ad817 100644 --- a/appliances/OneKE_1.27/8285d732-0741-4623-ba9e-4eacd2421e91.yaml +++ b/appliances/OneKE_1.27/8285d732-0741-4623-ba9e-4eacd2421e91.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27 VNF -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- Appliance providing several Virtual Network Functions (routing, NAT, DNS, DHCP) @@ -23,35 +23,32 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 opennebula_template: context: - network: "YES" - oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0" - oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0" - oneapp_vnf_dhcp4_enabled: "NO" - oneapp_vnf_dns_enabled: "NO" - oneapp_vnf_keepalived_enabled: "YES" - oneapp_vnf_keepalived_vrid: "$ONEAPP_VNF_KEEPALIVED_VRID" - oneapp_vnf_lb_enabled: "NO" - oneapp_vnf_lb_onegate_enabled: "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" - 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_config: "$ONEAPP_VNF_HAPROXY_CONFIG" - 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" - report_ready: "YES" - ssh_public_key: "$USER[SSH_PUBLIC_KEY]" - token: "YES" + ONEAPP_VNF_KEEPALIVED_ETH0_SKIP: "YES" # do *NOT* use eth0 for VRRP traffic + 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_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" @@ -67,11 +64,11 @@ opennebula_template: logo: router.png images: - name: oneke_vnf - url: https://d24fmfybwxpuhu.cloudfront.net/service_vnf-6.6.1-1.20230607.qcow2 + url: https://d24fmfybwxpuhu.cloudfront.net/service_VRouter-6.8.1-1.20240119.qcow2 type: OS dev_prefix: vd driver: qcow2 size: 2147483648 checksum: - md5: d3044cba08d935b70d4f732c313362c9 - sha256: d9af26e9424933c9a3b0b81f0d8b265ab777bdb33984b840d2ec061ab3758bcc + md5: acefac8236f18332e081894e899c6961 + sha256: 7de8346a457504ab3974bdbd955e3d896f5d8799f5596f31fe7b3eb0c57ad6fa diff --git a/appliances/OneKE_1.27/b33066eb-03ae-4338-9f97-2189457f6cb3.yaml b/appliances/OneKE_1.27/b33066eb-03ae-4338-9f97-2189457f6cb3.yaml index b802350..ee8d229 100644 --- a/appliances/OneKE_1.27/b33066eb-03ae-4338-9f97-2189457f6cb3.yaml +++ b/appliances/OneKE_1.27/b33066eb-03ae-4338-9f97-2189457f6cb3.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27 OS disk -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27 appliance OS disk. @@ -20,11 +20,11 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 images: - name: oneke_os - url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.6.1-1.20231211.qcow2 + url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.8.1-1.20240119.qcow2 type: OS dev_prefix: vd driver: qcow2 - size: 21474836480 + size: 26843545600 checksum: - md5: b4835ac32093b89d05993da9ecac5e59 - sha256: de0d711208abea309aca6d7901d51af1a47e5f81943ba16f27e2f079f6496de3 + md5: 1c47e4fc03544e46e54599b198f10428 + sha256: b37007a13dab5a818bcdb818507ee109e81257e0fece8ecbd29cea0c25561139 diff --git a/appliances/OneKE_1.27/c76926e6-4c0a-499f-848f-716b3164bf31.yaml b/appliances/OneKE_1.27/c76926e6-4c0a-499f-848f-716b3164bf31.yaml index 6d8f79f..317ca63 100644 --- a/appliances/OneKE_1.27/c76926e6-4c0a-499f-848f-716b3164bf31.yaml +++ b/appliances/OneKE_1.27/c76926e6-4c0a-499f-848f-716b3164bf31.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27 Storage -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27 VM template for Storage VMs. @@ -22,19 +22,25 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 opennebula_template: context: - grow_fs: "/ /var/lib/longhorn" - network: "YES" - report_ready: "YES" - token: "YES" - oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0" - oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0" - 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_storage_mountpoint: "/var/lib/longhorn" - ssh_public_key: "$USER[SSH_PUBLIC_KEY]" + GROW_FS: "/ /var/lib/longhorn" + 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_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_LONGHORN_ENABLED: "$ONEAPP_K8S_LONGHORN_ENABLED" + ONEAPP_STORAGE_DEVICE: "$ONEAPP_STORAGE_DEVICE" + ONEAPP_STORAGE_FILESYSTEM: "$ONEAPP_STORAGE_FILESYSTEM" + ONEAPP_STORAGE_MOUNTPOINT: "/var/lib/longhorn" + 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" cpu: "2" vcpu: "2" graphics: diff --git a/appliances/OneKE_1.27a/157b4f75-a216-4b42-b58e-2a21e95d09ec.yaml b/appliances/OneKE_1.27a/157b4f75-a216-4b42-b58e-2a21e95d09ec.yaml index 614177f..29522a6 100644 --- a/appliances/OneKE_1.27a/157b4f75-a216-4b42-b58e-2a21e95d09ec.yaml +++ b/appliances/OneKE_1.27a/157b4f75-a216-4b42-b58e-2a21e95d09ec.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27a -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27a VM template for Master and Worker VMs (**airgapped install**). @@ -22,27 +22,36 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 opennebula_template: context: - grow_fs: "/" - network: "YES" - report_ready: "YES" - token: "YES" - oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0" - oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0" - 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_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]" - one_service_airgapped: "YES" + GROW_FS: "/" + NETWORK: "YES" + TOKEN: "YES" + REPORT_READY: "YES" + SSH_PUBLIC_KEY: "$USER[SSH_PUBLIC_KEY]" + ONE_SERVICE_AIRGAPPED: "YES" + 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_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" + 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" cpu: "2" vcpu: "2" graphics: diff --git a/appliances/OneKE_1.27a/2353fb4f-bd0f-43d1-a0f5-fac8e77ea158.yaml b/appliances/OneKE_1.27a/2353fb4f-bd0f-43d1-a0f5-fac8e77ea158.yaml index db88314..cda714a 100644 --- a/appliances/OneKE_1.27a/2353fb4f-bd0f-43d1-a0f5-fac8e77ea158.yaml +++ b/appliances/OneKE_1.27a/2353fb4f-bd0f-43d1-a0f5-fac8e77ea158.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27a OS disk -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27a appliance OS disk (**airgapped install**). @@ -20,11 +20,11 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 images: - name: oneke_os - url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKEa-6.6.1-1.20231211.qcow2 + url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKEa-6.8.1-1.20240119.qcow2 type: OS dev_prefix: vd driver: qcow2 - size: 21474836480 + size: 26843545600 checksum: - md5: 66030955913bcd7c04d5bb35fb1b94cf - sha256: 23ad460cc5cc84b23b0cccaff17e6d3cc5bcc0ffe5e2399a4f25bebd2f256afe + md5: ddac834d23a8292e7e71818c19ce9393 + sha256: 2c3344bdd689b8c7f5b5aad8d02f9aef6fa5f06b4f9475dd418a6ff01a32323e diff --git a/appliances/OneKE_1.27a/6f97fe15-0d4f-4a13-9cec-1766cd2bf225.yaml b/appliances/OneKE_1.27a/6f97fe15-0d4f-4a13-9cec-1766cd2bf225.yaml index dbc7c6c..647ded8 100644 --- a/appliances/OneKE_1.27a/6f97fe15-0d4f-4a13-9cec-1766cd2bf225.yaml +++ b/appliances/OneKE_1.27a/6f97fe15-0d4f-4a13-9cec-1766cd2bf225.yaml @@ -1,6 +1,6 @@ --- name: Service OneKE 1.27a -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.27a cluster (**airgapped install**) for KVM and vCenter hosts, @@ -55,22 +55,22 @@ opennebula_template: NETWORK_ID = "$Private" ] ONEAPP_VROUTER_ETH0_VIP0 = "$ONEAPP_VROUTER_ETH0_VIP0" ONEAPP_VROUTER_ETH1_VIP0 = "$ONEAPP_VROUTER_ETH1_VIP0" - 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" ONEAPP_VNF_HAPROXY_INTERFACES = "$ONEAPP_VNF_HAPROXY_INTERFACES" ONEAPP_VNF_HAPROXY_REFRESH_RATE = "$ONEAPP_VNF_HAPROXY_REFRESH_RATE" - ONEAPP_VNF_HAPROXY_CONFIG = "$ONEAPP_VNF_HAPROXY_CONFIG" - ONEAPP_VNF_HAPROXY_LB0_IP = "$ONEAPP_VROUTER_ETH0_VIP0" - ONEAPP_VNF_HAPROXY_LB0_PORT = "9345" - ONEAPP_VNF_HAPROXY_LB1_IP = "$ONEAPP_VROUTER_ETH0_VIP0" - ONEAPP_VNF_HAPROXY_LB1_PORT = "6443" - ONEAPP_VNF_HAPROXY_LB2_IP = "$ONEAPP_VROUTER_ETH0_VIP0" + 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_VROUTER_ETH0_VIP0" + ONEAPP_VNF_HAPROXY_LB3_IP = "" ONEAPP_VNF_HAPROXY_LB3_PORT = "$ONEAPP_VNF_HAPROXY_LB3_PORT" - ONEAPP_VNF_KEEPALIVED_VRID = "$ONEAPP_VNF_KEEPALIVED_VRID" + ONEAPP_VNF_DNS_ENABLED = "$ONEAPP_VNF_DNS_ENABLED" + ONEAPP_VNF_DNS_INTERFACES = "$ONEAPP_VNF_DNS_INTERFACES" + 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: [] @@ -84,6 +84,8 @@ opennebula_template: NETWORK_ID = "$Private" ] 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_MULTUS_ENABLED = "$ONEAPP_K8S_MULTUS_ENABLED" ONEAPP_K8S_MULTUS_CONFIG = "$ONEAPP_K8S_MULTUS_CONFIG" @@ -95,6 +97,11 @@ 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_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: [] @@ -107,15 +114,20 @@ opennebula_template: NETWORK_ID = "$Private" ] 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_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_LB2_IP = "$ONEAPP_VROUTER_ETH0_VIP0" + 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_VROUTER_ETH0_VIP0" + 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: [] @@ -128,11 +140,16 @@ opennebula_template: NETWORK_ID = "$Private" ] 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_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: [] @@ -140,9 +157,11 @@ opennebula_template: Public: "M|network|Public||id:" Private: "M|network|Private||id:" custom_attrs: - ONEAPP_VROUTER_ETH0_VIP0: "M|text|Control Plane Endpoint VIP (IPv4)||" + ONEAPP_VROUTER_ETH0_VIP0: "O|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_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" 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" @@ -157,14 +176,16 @@ opennebula_template: 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_CONFIG: "O|text|Custom Haproxy config (default none)||" + 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_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_VNF_KEEPALIVED_VRID: "O|number|Global vrouter id (1-255)||1" ready_status_gate: true logo: kubernetes.png images: [] diff --git a/appliances/OneKE_1.27a/b963e931-1ddc-4976-bf6a-f304a53ab19c.yaml b/appliances/OneKE_1.27a/b963e931-1ddc-4976-bf6a-f304a53ab19c.yaml index 0ea7dc9..a14f3a0 100644 --- a/appliances/OneKE_1.27a/b963e931-1ddc-4976-bf6a-f304a53ab19c.yaml +++ b/appliances/OneKE_1.27a/b963e931-1ddc-4976-bf6a-f304a53ab19c.yaml @@ -1,6 +1,6 @@ --- name: OneKE 1.27a Storage -version: 1.27.2-6.6.1-1.20231211 +version: 1.27.2-6.8.1-1.20240119 publisher: OpenNebula Systems description: |- OneKE 1.27a VM template for Storage VMs (**airgapped install**). @@ -22,20 +22,25 @@ opennebula_version: >- 6.2, 6.3, 6.4, 6.6, 6.8 opennebula_template: context: - grow_fs: "/ /var/lib/longhorn" - network: "YES" - report_ready: "YES" - token: "YES" - oneapp_vrouter_eth0_vip0: "$ONEAPP_VROUTER_ETH0_VIP0" - oneapp_vrouter_eth1_vip0: "$ONEAPP_VROUTER_ETH1_VIP0" - 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_storage_mountpoint: "/var/lib/longhorn" - ssh_public_key: "$USER[SSH_PUBLIC_KEY]" - one_service_airgapped: "YES" + GROW_FS: "/ /var/lib/longhorn" + NETWORK: "YES" + TOKEN: "YES" + REPORT_READY: "YES" + SSH_PUBLIC_KEY: "$USER[SSH_PUBLIC_KEY]" + ONE_SERVICE_AIRGAPPED: "YES" + 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_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_STORAGE_MOUNTPOINT: "/var/lib/longhorn" + 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" cpu: "2" vcpu: "2" graphics: