Revert the over-complicated cilium BGP/range logic

Author: sk4zuzu

appliances/OneKE/cilium.rb

@@ -23,9 +23,6 @@ def configure_cilium(manifest_dir = K8S_MANIFEST_DIR, endpoint = ONEAPP_K8S_CONT
     if ONEAPP_K8S_CNI_CONFIG.nil?
         msg :info, 'Create Cilium CRD config from user-provided ranges'
 
-        enable_bgp = ONEAPP_K8S_CILIUM_BGP_ENABLED \
-            || (ONEAPP_K8S_CILIUM_BGP_ENABLED.nil? && !ONEAPP_K8S_CILIUM_RANGES.empty?)
-
         documents = YAML.load_stream <<~MANIFEST
         ---
         apiVersion: helm.cattle.io/v1
@@ -42,10 +39,10 @@ def configure_cilium(manifest_dir = K8S_MANIFEST_DIR, endpoint = ONEAPP_K8S_CONT
               chainingMode: "none"
               exclusive: false
             bgpControlPlane:
-              enabled: #{enable_bgp}
+              enabled: #{ONEAPP_K8S_CILIUM_BGP_ENABLED}
         MANIFEST
 
-        if enable_bgp
+        if ONEAPP_K8S_CILIUM_BGP_ENABLED
             documents += YAML.load_stream <<~MANIFEST
             ---
             apiVersion: cilium.io/v2alpha1

appliances/OneKE/cilium_spec.rb

@@ -43,47 +43,6 @@
         ---
         apiVersion: helm.cattle.io/v1
         kind: HelmChartConfig
-        metadata:
-          name: rke2-cilium
-          namespace: kube-system
-        spec:
-          valuesContent: |-
-            kubeProxyReplacement: true
-            k8sServiceHost: "192.168.150.86"
-            k8sServicePort: 6443
-            cni:
-              chainingMode: "none"
-              exclusive: false
-            bgpControlPlane:
-              enabled: true
-        ---
-        apiVersion: cilium.io/v2alpha1
-        kind: CiliumLoadBalancerIPPool
-        metadata:
-          name: default
-          namespace: kube-system
-        spec:
-          blocks:
-          - cidr: 192.168.150.128/25
-          - cidr: 10.11.12.0/24
-          allowFirstLastIPs: "No"
-        MANIFEST
-        Dir.mktmpdir do |temp_dir|
-            configure_cilium temp_dir
-            result = YAML.load_stream File.read "#{temp_dir}/rke2-cilium-config.yaml"
-            expect(result).to eq output
-        end
-    end
-
-    it 'should not define ip ranges when ONEAPP_K8S_CILIUM_BGP_ENABLED is false and ONEAPP_K8S_CILIUM_RANGES is not empty' do
-        stub_const 'ONEAPP_K8S_CONTROL_PLANE_EP', '192.168.150.86:6443'
-        stub_const 'ONEAPP_K8S_CNI_PLUGIN', 'cilium'
-        stub_const 'ONEAPP_K8S_CILIUM_BGP_ENABLED', false
-        stub_const 'ONEAPP_K8S_CILIUM_RANGES', ['192.168.150.128/25', '10.11.12.0/24']
-        output = YAML.load_stream <<~MANIFEST
-        ---
-        apiVersion: helm.cattle.io/v1
-        kind: HelmChartConfig
         metadata:
           name: rke2-cilium
           namespace: kube-system
@@ -225,5 +184,4 @@
             expect(result).to eq output
         end
     end
-
 end

appliances/OneKE/config.rb

@@ -19,7 +19,7 @@
 
 ONEAPP_K8S_CNI_PLUGIN         = env :ONEAPP_K8S_CNI_PLUGIN, 'cilium'
 ONEAPP_K8S_CNI_CONFIG         = env :ONEAPP_K8S_CNI_CONFIG, nil
-ONEAPP_K8S_CILIUM_BGP_ENABLED = env :ONEAPP_K8S_CILIUM_BGP_ENABLED, nil
+ONEAPP_K8S_CILIUM_BGP_ENABLED = env :ONEAPP_K8S_CILIUM_BGP_ENABLED, 'NO'
 ONEAPP_K8S_CILIUM_RANGES      = ENV.select { |key, _| key.start_with? 'ONEAPP_K8S_CILIUM_RANGE' } .values
 
 ONEAPP_K8S_LONGHORN_CHART_VERSION = env :ONEAPP_K8S_LONGHORN_CHART_VERSION, '1.7.2'