Skip to content

Commit

Permalink
F OpenNebula/one-apps#83: OneKE/VR upgrade 1.27 -> 1.29
Browse files Browse the repository at this point in the history
  • Loading branch information
sk4zuzu committed May 10, 2024
1 parent 23f5657 commit 8c6c82a
Show file tree
Hide file tree
Showing 21 changed files with 843 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ os-release: "22.04 LTS"
os-arch: x86_64
hypervisor: ALL
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
opennebula_template:
context:
SERVICE_ID: "$SERVICE_ID"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ creation_time: 1706711624
os-id: none
os-arch: all
hypervisor: ALL
opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8
opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10
images:
- name: oneke_storage
url: >-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ os-arch: x86_64
hypervisor: ALL
type: SERVICE_TEMPLATE
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
roles:
vnf: "OneKE 1.27 VNF"
master: "OneKE 1.27"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ os-id: Alpine
os-release: '3.18'
os-arch: x86_64
hypervisor: ALL
opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8
opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10
opennebula_template:
context:
service_id: "$SERVICE_ID"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ creation_time: 1706711624
os-id: none
os-arch: all
hypervisor: ALL
opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8
opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10
images:
- name: oneke_os
url: >-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ os-release: "22.04 LTS"
os-arch: x86_64
hypervisor: ALL
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
opennebula_template:
context:
SERVICE_ID: "$SERVICE_ID"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ os-release: "22.04 LTS"
os-arch: x86_64
hypervisor: ALL
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
opennebula_template:
context:
SERVICE_ID: "$SERVICE_ID"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ os-id: none
os-arch: all
hypervisor: ALL
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
images:
- name: oneke_os
url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKEa-6.8.1-1-20240131.qcow2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ os-arch: x86_64
hypervisor: ALL
type: SERVICE_TEMPLATE
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
roles:
vnf: "OneKE 1.27 VNF"
master: "OneKE 1.27 Airgapped"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ os-release: "22.04 LTS"
os-arch: x86_64
hypervisor: ALL
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
opennebula_template:
context:
SERVICE_ID: "$SERVICE_ID"
Expand Down
30 changes: 30 additions & 0 deletions appliances/OneKE_1.29/19b689a2-4e06-46f7-9a26-f2041e805982.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: OneKE 1.29 Storage disk
version: 1.29.2-6.10.0-1-20240510
publisher: OpenNebula Systems
description: |-
OneKE 1.29 appliance Storage disk (empty).
See the dedicated [documentation](https://docs.opennebula.io/stable/marketplace/appliances/oneke.html).
short_description: OneKE 1.29 appliance Storage disk
tags:
- disk
- kubernetes
- service
format: qcow2
creation_time: 1715358765
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-1-20240508.qcow2
type: OS
dev_prefix: vd
driver: qcow2
size: 10737418240
checksum:
md5: 1d4589798b8a63a6afa7150492ca3193
sha256: 23a1edeac969b498874484637169fd08de4a7f18f438594fee7103236ba000db
199 changes: 199 additions & 0 deletions appliances/OneKE_1.29/591dd3f1-220f-46a5-83f4-31031c753b8a.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
---
name: Service OneKE 1.29
version: 1.29.2-6.10.0-1-20240510
publisher: OpenNebula Systems
description: |-
[RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.29 cluster for KVM hosts,
orchestrated by
[OneFlow](https://docs.opennebula.io/stable/management_and_operations/multivm_service_management/appflow_elasticity.html).
Requires
[OneFlow](https://docs.opennebula.io/stable/management_and_operations/multivm_service_management/overview.html)
and
[OneGate](https://docs.opennebula.io/stable/management_and_operations/multivm_service_management/onegate_usage.html)
OpenNebula components.
See the dedicated [documentation](https://docs.opennebula.io/stable/marketplace/appliances/oneke.html).
Based on VM templates
- [OneKE 1.29](/appliance/d6278d1b-66a4-4188-acd0-e2628296046)
- [OneKE 1.29 VNF](/appliance/883d974f-f30e-4fc8-aa06-e1af2a020e49)
- [OneKE 1.29 Storage](/appliance/664cf3c1-9ac4-4793-abc3-559323786330)
short_description: Multi-master Kubernetes 1.29 cluster for KVM hosts, orchestrated by OneFlow
tags:
- kubernetes
- oneflow
- service
- ubuntu
creation_time: 1715358765
os-id: Ubuntu
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
roles:
vnf: "OneKE 1.29 VNF"
master: "OneKE 1.29"
worker: "OneKE 1.29"
storage: "OneKE 1.29 Storage"
opennebula_template:
name: OneKE 1.29
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 = "<ETH0_EP0>"
ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT"
ONEAPP_VNF_HAPROXY_LB1_IP = "<ETH0_EP0>"
ONEAPP_VNF_HAPROXY_LB1_PORT = "$ONEAPP_VNF_HAPROXY_LB1_PORT"
ONEAPP_VNF_HAPROXY_LB2_IP = "<ETH0_EP0>"
ONEAPP_VNF_HAPROXY_LB2_PORT = "$ONEAPP_VNF_HAPROXY_LB2_PORT"
ONEAPP_VNF_HAPROXY_LB3_IP = "<ETH0_EP0>"
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_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 = "<ETH0_EP0>"
ONEAPP_VNF_HAPROXY_LB0_PORT = "$ONEAPP_VNF_HAPROXY_LB0_PORT"
ONEAPP_VNF_HAPROXY_LB1_IP = "<ETH0_EP0>"
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_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 = "<ETH0_EP0>"
ONEAPP_VNF_HAPROXY_LB2_PORT = "$ONEAPP_VNF_HAPROXY_LB2_PORT"
ONEAPP_VNF_HAPROXY_LB3_IP = "<ETH0_EP0>"
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_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:"
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_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_RANGE: "O|text|Cilium LB IP CIDR (default none)||"
ONEAPP_K8S_METALLB_ENABLED: "O|boolean|Enable MetalLB||NO"
ONEAPP_K8S_METALLB_RANGE: "O|text|MetalLB IP range (default none)||"
ONEAPP_K8S_METALLB_CONFIG: "O|text64|MetalLB custom config (default none)||"
ONEAPP_K8S_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: []
60 changes: 60 additions & 0 deletions appliances/OneKE_1.29/664cf3c1-9ac4-4793-abc3-559323786330.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
---
name: OneKE 1.29 Storage
version: 1.29.2-6.10.0-1-20240510
publisher: OpenNebula Systems
description: |-
OneKE 1.29 VM template for Storage VMs.
See the dedicated [documentation](https://docs.opennebula.io/stable/marketplace/appliances/oneke.html).
short_description: OneKE 1.29 VM template for Storage VMs
tags:
- kubernetes
- service
- ubuntu
type: VMTEMPLATE
format: qcow2
creation_time: 1715358765
os-id: Ubuntu
os-release: "22.04 LTS"
os-arch: x86_64
hypervisor: ALL
opennebula_version: >-
6.2, 6.3, 6.4, 6.6, 6.8, 6.10
opennebula_template:
context:
SERVICE_ID: "$SERVICE_ID"
FALLBACK_GW: "$FALLBACK_GW"
FALLBACK_DNS: "$FALLBACK_DNS"
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:
listen: "0.0.0.0"
type: vnc
inputs_order: ""
memory: "3072"
os:
arch: x86_64
user_inputs: {}
logo: kubernetes.png
disks:
- "OneKE 1.29 OS disk"
- "OneKE 1.29 Storage disk"
Loading

0 comments on commit 8c6c82a

Please sign in to comment.