mirror of https://github.com/k3s-io/k3s
7766b408b8
Automatic merge from submit-queue Add support for vpshere cloud provider in kubeup <!-- 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**: vSphere cloud provider added in 1.3 was not configured when deploying via kubeup **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **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 Add support for vSphere Cloud Provider when deploying via kubeup on vSphere. ``` When deploying on vSphere using kube up add configuration for vSphere cloud provider. |
||
|---|---|---|
| .. | ||
| calico | ||
| cluster-autoscaler | ||
| cni | ||
| debian-auto-upgrades | ||
| docker | ||
| e2e | ||
| e2e-image-puller | ||
| etcd | ||
| fluentd-es | ||
| fluentd-gcp | ||
| generate-cert | ||
| helpers | ||
| kube-addons | ||
| kube-admission-controls | ||
| kube-apiserver | ||
| kube-controller-manager | ||
| kube-master-addons | ||
| kube-node-unpacker | ||
| kube-proxy | ||
| kube-registry-proxy | ||
| kube-scheduler | ||
| kubelet | ||
| l7-gcp | ||
| logrotate | ||
| nginx | ||
| ntp | ||
| opencontrail-networking-master | ||
| opencontrail-networking-minion | ||
| openvpn | ||
| openvpn-client | ||
| rescheduler | ||
| salt-helpers | ||
| supervisor | ||
| README.md | ||
| base.sls | ||
| kube-client-tools.sls | ||
| top.sls | ||
README.md
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 |