Navigation Menu

Skip to content
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

Fix cni network provider #227

Merged
merged 1 commit into from Jan 4, 2019
Merged

Fix cni network provider #227

merged 1 commit into from Jan 4, 2019

Conversation

keur
Copy link
Contributor

@keur keur commented Dec 31, 2018

If a user deletes the flannel or the weave daemonset, a re-puppet should
add flannel back to the cluster. Because of the creates statement, one
would have to rm -rf /etc/cni/net.d and then re-puppet to get flannel
back. This is not intuitive behavor. This patch will re-apply flannel if
no flannel or weave daemonset exists.

manifests/kube_addons.pp Outdated Show resolved Hide resolved
If a user deletes the flannel or the weave daemonset, a re-puppet should
add flannel back to the cluster. Because of the creates statement, one
would have to `rm -rf /etc/cni/net.d` and then re-puppet to get flannel
back. This is not intuitive behavor. This patch will re-apply flannel if
no flannel or weave daemonset exists.
@keur
Copy link
Contributor Author

keur commented Jan 4, 2019

@davejrt fixed and force-pushed.

@davejrt
Copy link
Contributor

davejrt commented Jan 4, 2019

LGTM

@davejrt davejrt merged commit ca24fac into puppetlabs:master Jan 4, 2019
@davejrt davejrt added this to the 3.2.0 milestone Jan 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants