Switch to conflist cni configuration for flannel #2796
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Switches to use the newer
conflist
cni configuration. This is requiredbecause Kubernetes v1.16.0 introduces config validation:
kubernetes/kubernetes#80482 which is no longer
able to validate the old configuration. The behavior is the same with
the new configuration.
The configuration comes from the documented deployment from flannel: flannel-io/flannel#888. I did not include the portMapping config has we don't have pods with hostports (running in pod network).
Unfortunately this is not really covered by our e2e as it will only apply to new nodes. I have tested this by setting up a new cluster based on this configuration.
Required for #2774