Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

046e315b

Commit 046e315b authored 8 years ago by Matthew Mosesohn Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #595 from kubernetes-incubator/etcdtls-followup

Fix canal's calico networking config for ETCD TLS

parents 9ea9604b fe16fecd

No related branches found

No related tags found

Loading

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

roles/kubernetes/master/tasks/pre-upgrade.yml 9 additions, 0 deletions

roles/kubernetes/master/tasks/pre-upgrade.yml
roles/network_plugin/canal/tasks/main.yml 7 additions, 5 deletions

roles/network_plugin/canal/tasks/main.yml
roles/network_plugin/canal/templates/canal-node.yml.j2 0 additions, 27 deletions

roles/network_plugin/canal/templates/canal-node.yml.j2
roles/network_plugin/canal/templates/network.json.j2 0 additions, 1 deletion

roles/network_plugin/canal/templates/network.json.j2

with 16 additions and 33 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