f-145: Refactors ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER flag

Signed-off-by: Aleix Ramírez <aramirez@opennebula.io>
OpenNebula · Dec 12, 2024 · 5fac53f · 5fac53f
1 parent e8c4768
commit 5fac53f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/appliances/OneKE/config.rb b/appliances/OneKE/config.rb
@@ -38,7 +38,7 @@
 
 ONEAPP_K8S_RUBY_VERSION = env :ONEAPP_K8S_RUBY_VERSION, '3.3-alpine3.18'
 
-ONEAPP_K8S_CUSTOM_CLOUD_CONTROLLER = env :ONEAPP_K8S_CUSTOM_CLOUD_CONTROLLER, 'NO'
+ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER = env :ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER, 'YES'
 
 ONEAPP_VROUTER_ETH0_VIP0 = env :ONEAPP_VROUTER_ETH0_VIP0, nil
 ONEAPP_VROUTER_ETH1_VIP0 = env :ONEAPP_VROUTER_ETH1_VIP0, nil

diff --git a/appliances/OneKE/kubernetes.rb b/appliances/OneKE/kubernetes.rb
@@ -193,7 +193,7 @@ def init_master
         'disable'            => ['rke2-ingress-nginx'],
         'cni'                => cni,
         'disable-kube-proxy' => ONEAPP_K8S_CNI_PLUGIN == 'cilium',
-        'disable-cloud-controller' => ONEAPP_K8S_CUSTOM_CLOUD_CONTROLLER
+        'disable-cloud-controller' => ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER == false
     }
 
     msg :info, 'Prepare initial rke2-server config'
@@ -250,7 +250,7 @@ def join_master(token, retries = RETRIES, seconds = SECONDS)
         'disable'            => ['rke2-ingress-nginx'],
         'cni'                => cni,
         'disable-kube-proxy' => ONEAPP_K8S_CNI_PLUGIN == 'cilium',
-        'disable-cloud-controller' => ONEAPP_K8S_CUSTOM_CLOUD_CONTROLLER
+        'disable-cloud-controller' => ONEAPP_K8S_ENABLE_CLOUD_CONTROLLER == false
     }
 
     msg :info, 'Prepare rke2-server config'