f-157: replaces ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER by ONEAPP_K8S_RKE2…

…_CLOUD_CONTROLLER_ENABLED Signed-off-by: Aleix Ramírez <[email protected]>
OpenNebula · Dec 18, 2024 · 6ffb84a · 6ffb84a
1 parent 2720f1b
commit 6ffb84a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 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
@@ -48,7 +48,7 @@ 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_K8S_ENABLE_CLOUD_CONTROLLER: "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+    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"

diff --git a/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml b/appliances/OneKE_1.31/98df67fd-6dbd-49e3-a99d-9b8d8519c418.yaml
@@ -37,7 +37,7 @@ opennebula_template:
     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_ENABLE_CLOUD_CONTROLLER: "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+    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"

diff --git a/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml b/appliances/OneKE_1.31/e73d2dda-1816-4f47-981f-72f1255f94ac.yaml
@@ -91,7 +91,7 @@ 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_ENABLE_CLOUD_CONTROLLER = "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+      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"
@@ -129,7 +129,7 @@ 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_ENABLE_CLOUD_CONTROLLER = "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+      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"
@@ -162,7 +162,7 @@ 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_ENABLE_CLOUD_CONTROLLER = "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+      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"
@@ -186,7 +186,7 @@ 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_ENABLE_CLOUD_CONTROLLER: O|boolean|Enables default RKE2 cloud controller||YES
+    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

diff --git a/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml b/appliances/OneKE_1.31a/9378a80f-7556-46d2-8a89-43c8b03162e6.yaml
@@ -90,7 +90,7 @@ 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_ENABLE_CLOUD_CONTROLLER = "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+        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"
@@ -127,7 +127,7 @@ 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_ENABLE_CLOUD_CONTROLLER = "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+        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"
@@ -159,7 +159,7 @@ 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_ENABLE_CLOUD_CONTROLLER = "$ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER"
+        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"
@@ -183,7 +183,7 @@ 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_ENABLE_CLOUD_CONTROLLER: "O|boolean|Enables default RKE2 cloud controller||YES"
+    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