Revert "M #-: Update opennebula_version to 6.0..6.10 (#113)"

This reverts commit 1afec01.
OpenNebula · Aug 1, 2024 · f607dc6 · f607dc6
1 parent 1afec01
commit f607dc6
Show file tree

Hide file tree

Showing 75 changed files with 1,104 additions and 1,040 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
@@ -11,59 +11,60 @@ tags:
 - kubernetes
 - service
 - ubuntu
+type: VMTEMPLATE
 format: qcow2
 creation_time: 1683810523
 os-id: Ubuntu
-os-release: 22.04 LTS
+os-release: "22.04 LTS"
 os-arch: x86_64
 hypervisor: ALL
-opennebula_version: 6.0, 6.2, 6.4, 6.6, 6.8, 6.10
+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: "/"
-    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'
+    SERVICE_ID: "$SERVICE_ID"
+    FALLBACK_GW: "$FALLBACK_GW"
+    FALLBACK_DNS: "$FALLBACK_DNS"
+    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:
-    listen: 0.0.0.0
+    listen: "0.0.0.0"
     type: vnc
-  inputs_order: ''
-  memory: '3072'
+  inputs_order: ""
+  memory: "3072"
   os:
     arch: x86_64
   user_inputs: {}
 logo: kubernetes.png
-type: VMTEMPLATE
 disks:
-- OneKE 1.27 OS disk
+- "OneKE 1.27 OS disk"
diff --git a/appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml b/appliances/OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml
@@ -16,7 +16,7 @@ creation_time: 1706711624
 os-id: none
 os-arch: all
 hypervisor: ALL
-opennebula_version: 6.0, 6.2, 6.4, 6.6, 6.8, 6.10
+opennebula_version: 6.2, 6.3, 6.4, 6.6, 6.8, 6.10
 images:
 - name: oneke_storage
   url: >-