Skip to content

Fix calico manifest URL for v3.24.0 and newer #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions tooling/kube_tool/other_params.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ def OtherParams.create(opts)
cni_network_provider = 'https://github.com/raw/coreos/flannel/master/Documentation/kube-flannel.yml'
cni_pod_cidr = '10.244.0.0/16'
when 'calico'
cni_network_provider = "https://docs.projectcalico.org/archive/#{opts[:cni_provider_version]}/manifests/calico.yaml"
if options[:cni_provider_version].nil?
abort('Please set $cni_provider_version variable to specify the version of calico you want to install (3.24.0 and newer)')
end
cni_network_provider = "https://github.com/raw/projectcalico/calico/v#{opts[:cni_provider_version]}/manifests/calico.yaml"
cni_pod_cidr = '192.168.0.0/16'
when 'calico-tigera'
cni_network_preinstall = "https://docs.projectcalico.org/manifests/tigera-operator.yaml"
cni_network_provider = "https://docs.projectcalico.org/manifests/custom-resources.yaml"
if options[:cni_provider_version].nil?
abort('Please set $cni_provider_version variable to specify the version of calico-tigera you want to install (3.24.0 and newer)')
end
cni_network_preinstall = "https://github.com/raw/projectcalico/calico/v#{opts[:cni_provider_version]}/manifests/tigera-operator.yaml"
cni_network_provider = "https://github.com/raw/projectcalico/calico/v#{opts[:cni_provider_version]}/manifests/custom-resources.yaml"
cni_pod_cidr = '192.168.0.0/16'
when 'cilium'
cni_pod_cidr = '10.244.0.0/16'
Expand Down