From ee7c2e60ad27c87b38b20deb868faac12e1e9ed9 Mon Sep 17 00:00:00 2001
From: Michal Opala <mopala@opennebula.io>
Date: Fri, 26 Jan 2024 12:07:16 +0100
Subject: [PATCH] M #-: oneke: Get fallback GW/DNS via OneFlow interpolation

---
 .../OneKE_1.27/0b0d2ae3-c5ec-4949-bd2e-7f4f2da0cb96.yaml | 5 ++++-
 .../OneKE_1.27/1b948c64-a0b4-41f7-b816-dda99b4a8088.yaml | 2 +-
 .../OneKE_1.27/7c82d610-73f1-47d1-a85a-d799e00c631e.yaml | 8 +++++++-
 .../OneKE_1.27/8285d732-0741-4623-ba9e-4eacd2421e91.yaml | 9 +++++----
 .../OneKE_1.27/b33066eb-03ae-4338-9f97-2189457f6cb3.yaml | 8 ++++----
 .../OneKE_1.27/c76926e6-4c0a-499f-848f-716b3164bf31.yaml | 5 ++++-
 .../157b4f75-a216-4b42-b58e-2a21e95d09ec.yaml            | 5 ++++-
 .../2353fb4f-bd0f-43d1-a0f5-fac8e77ea158.yaml            | 8 ++++----
 .../6f97fe15-0d4f-4a13-9cec-1766cd2bf225.yaml            | 8 +++++++-
 .../b963e931-1ddc-4976-bf6a-f304a53ab19c.yaml            | 5 ++++-
 10 files changed, 44 insertions(+), 19 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 e500e2f..a543d5c 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27 VM template for Master and Worker VMs.
@@ -22,6 +22,9 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6, 6.8
 opennebula_template:
   context:
+    SERVICE_ID: "$SERVICE_ID"
+    FALLBACK_GW: "$FALLBACK_GW"
+    FALLBACK_DNS: "$FALLBACK_DNS"
     GROW_FS: "/"
     NETWORK: "YES"
     TOKEN: "YES"
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 1f11209..8e3af81 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 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 ab8c570..146c54f 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.27 cluster for KVM and vCenter hosts,
@@ -82,6 +82,8 @@ opennebula_template:
         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"
@@ -112,6 +114,8 @@ opennebula_template:
         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"
@@ -138,6 +142,8 @@ opennebula_template:
         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"
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 79ad817..8f566b6 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   Appliance providing several Virtual Network Functions (routing, NAT, DNS, DHCP)
@@ -23,6 +23,7 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6, 6.8
 opennebula_template:
   context:
+    SERVICE_ID: "$SERVICE_ID"
     ONEAPP_VNF_KEEPALIVED_ETH0_SKIP: "YES" # do *NOT* use eth0 for VRRP traffic
     NETWORK: "YES"
     TOKEN: "YES"
@@ -64,11 +65,11 @@ opennebula_template:
 logo: router.png
 images:
 - name: oneke_vnf
-  url: https://d24fmfybwxpuhu.cloudfront.net/service_VRouter-6.8.1-1.20240119.qcow2
+  url: https://d24fmfybwxpuhu.cloudfront.net/service_VRouter-6.8.1-1.20240126.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2
   size: 2147483648
   checksum:
-    md5: acefac8236f18332e081894e899c6961
-    sha256: 7de8346a457504ab3974bdbd955e3d896f5d8799f5596f31fe7b3eb0c57ad6fa
+    md5: f714b66470f1ed05024b8cb90d098358
+    sha256: aac2d83d64a8d5ca1cc46192bbf7cdde58f5330bd58460b75d5018e98160092e
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 ee8d229..4b9de75 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 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.8.1-1.20240119.qcow2
+  url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKE-6.8.1-1.20240126.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2
   size: 26843545600
   checksum:
-    md5: 1c47e4fc03544e46e54599b198f10428
-    sha256: b37007a13dab5a818bcdb818507ee109e81257e0fece8ecbd29cea0c25561139
+    md5: 3ed234c06de5dbd18fcdafc57fba4bab
+    sha256: 6beeec9ba10a58e610c51644d4e85524c2d790af7a5f62c55abf579989c34f20
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 317ca63..18ed59a 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27 VM template for Storage VMs.
@@ -22,6 +22,9 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6, 6.8
 opennebula_template:
   context:
+    SERVICE_ID: "$SERVICE_ID"
+    FALLBACK_GW: "$FALLBACK_GW"
+    FALLBACK_DNS: "$FALLBACK_DNS"
     GROW_FS: "/ /var/lib/longhorn"
     NETWORK: "YES"
     TOKEN: "YES"
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 29522a6..dfae296 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27a VM template for Master and Worker VMs (**airgapped install**).
@@ -22,6 +22,9 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6, 6.8
 opennebula_template:
   context:
+    SERVICE_ID: "$SERVICE_ID"
+    FALLBACK_GW: "$FALLBACK_GW"
+    FALLBACK_DNS: "$FALLBACK_DNS"
     GROW_FS: "/"
     NETWORK: "YES"
     TOKEN: "YES"
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 cda714a..1661f2d 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 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.8.1-1.20240119.qcow2
+  url: https://d24fmfybwxpuhu.cloudfront.net/service_OneKEa-6.8.1-1.20240126.qcow2
   type: OS
   dev_prefix: vd
   driver: qcow2
   size: 26843545600
   checksum:
-    md5: ddac834d23a8292e7e71818c19ce9393
-    sha256: 2c3344bdd689b8c7f5b5aad8d02f9aef6fa5f06b4f9475dd418a6ff01a32323e
+    md5: edcc26ddbf65dc3749410fe49953ee3d
+    sha256: fa0e3bd87cf4b2671dc6abb912ecae5d19be3dfdbd15ebfb1f4db006ba117d77
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 647ded8..270dc11 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   [RKE2](https://docs.rke2.io/) based multi-master Kubernetes 1.27a cluster (**airgapped install**) for KVM and vCenter hosts,
@@ -82,6 +82,8 @@ opennebula_template:
         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"
@@ -112,6 +114,8 @@ opennebula_template:
         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"
@@ -138,6 +142,8 @@ opennebula_template:
         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"
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 a14f3a0..d8e352c 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.8.1-1.20240119
+version: 1.27.2-6.8.1-1.20240126
 publisher: OpenNebula Systems
 description: |-
   OneKE 1.27a VM template for Storage VMs (**airgapped install**).
@@ -22,6 +22,9 @@ opennebula_version: >-
   6.2, 6.3, 6.4, 6.6, 6.8
 opennebula_template:
   context:
+    SERVICE_ID: "$SERVICE_ID"
+    FALLBACK_GW: "$FALLBACK_GW"
+    FALLBACK_DNS: "$FALLBACK_DNS"
     GROW_FS: "/ /var/lib/longhorn"
     NETWORK: "YES"
     TOKEN: "YES"