Fix docker image tooling to behave like module

Author: treydock

tooling/kube_tool/other_params.rb

@@ -28,11 +28,11 @@ def OtherParams.create(os, version, container_runtime, cni_provider, cni_provide
        cni_network_provider = 'https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml'
        cni_pod_cidr = '10.244.0.0/16'
     elsif cni_provider.match('calico')
-       cni_network_preinstall = "https://docs.projectcalico.org/manifests/tigera-operator.yaml"
-       cni_network_provider = "https://docs.projectcalico.org/manifests/custom-resources.yaml"
+       cni_network_provider = "https://docs.projectcalico.org/archive/#{cni_provider_version}/manifests/calico.yaml"
        cni_pod_cidr = '192.168.0.0/16'
     elsif cni_provider.match('calico-tigera')
-       cni_network_provider = "https://docs.projectcalico.org/archive/#{cni_provider_version}/manifests/calico.yaml"
+       cni_network_preinstall = "https://docs.projectcalico.org/manifests/tigera-operator.yaml"
+       cni_network_provider = "https://docs.projectcalico.org/manifests/custom-resources.yaml"
        cni_pod_cidr = '192.168.0.0/16'
     elsif cni_provider.match('cilium')
       cni_pod_cidr = '10.244.0.0/16'