10061ac358
Automatic merge from submit-queue Deprecate the --reconcile-cidr flag <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md 2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md 3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes --> **What this PR does / why we need it**: Follows up https://github.com/kubernetes/kubernetes/pull/34906 **Special notes for your reviewer**: I'm not sure why coreos had set `--reconcile-cidr` to `false` and what the implications are now. **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> ```release-note Deprecate the --reconcile-cidr kubelet flag because it has no function anymore ``` PTAL @thockin @freehan @justinsb @yujuhong @kubernetes/sig-node @kubernetes/sig-network **I will add `hack/update-all.sh` contents soon to fix builds**
This directory forms the base of the main SaltStack configuration. The
place to start with any SaltStack configuration is
top.sls. However, unless you are particularly keen on
reading Jinja templates, the following tables break down what
configurations run on what providers. (NB: The _states
directory is a special directory included by Salt for ensure blocks,
and is only used for the docker config.)
Key: M = Config applies to master, n = config applies to nodes
| Config | GCE | Vagrant | AWS | Azure |
|---|---|---|---|---|
| debian-auto-upgrades | M n | M n | M n | M n |
| docker | M n | M n | M n | M n |
| etcd | M | M | M | M |
| fluentd-es (pillar conditional) | M n | M n | M n | M n |
| fluentd-gcp (pillar conditional) | M n | M n | M n | M n |
| generate-cert | M | M | M | M |
| kube-addons | M | M | M | M |
| kube-apiserver | M | M | M | M |
| kube-controller-manager | M | M | M | M |
| kube-proxy | n | n | n | n |
| kube-scheduler | M | M | M | M |
| kubelet | M n | M n | M n | M n |
| logrotate | M n | n | M n | M n |
| supervisord | M n | M n | M n | M n |
| nginx | M | |||
| openvpn-client | n | |||
| openvpn | M | |||
| base | M n | M n | M n | M n |
| kube-client-tools | M | M | M | M |