Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

2faa8f1e

Unverified Commit 2faa8f1e authored 6 years ago by k8s-ci-robot Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #3254 from mattymo/calico_upgrade_tweaks

Fix backward compatibility with calico 2.6

parents ab462d92 dc3e317d

No related branches found

No related tags found

Loading

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

roles/kubernetes-apps/network_plugin/calico/tasks/main.yml 1 addition, 0 deletions

roles/kubernetes-apps/network_plugin/calico/tasks/main.yml
roles/kubespray-defaults/defaults/main.yaml 3 additions, 0 deletions

roles/kubespray-defaults/defaults/main.yaml
roles/network_plugin/calico/defaults/main.yml 2 additions, 1 deletion

roles/network_plugin/calico/defaults/main.yml
roles/network_plugin/calico/tasks/install.yml 43 additions, 2 deletions

roles/network_plugin/calico/tasks/install.yml
roles/network_plugin/calico/tasks/main.yml 1 addition, 0 deletions

roles/network_plugin/calico/tasks/main.yml

with 50 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment