k3s/cluster/saltbase
Kubernetes Submit Queue 7228ac1984 Merge pull request #31057 from johscheuer/fix-kube-controller-manager.manifest
Automatic merge from submit-queue

Fixes #31056

This PR fixes the issue described in https://github.com/kubernetes/kubernetes/issues/31056 - In https://github.com/kubernetes/kubernetes/blob/master/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest#L82 there is a missing `+` after `" "`

result:
```
==> master: Summary
==> master: -------------
==> master: Succeeded: 52 (changed=43)
==> master: Failed:     0
==> master: -------------
==> master: Total states run:     52
```
2016-08-20 13:00:38 -07:00
..
pillar AWS kube-up: Add support for wily 2016-02-17 10:45:21 -05:00
reactor Add ga-beacon analytics to gendocs scripts 2015-05-15 18:56:38 -07:00
salt Merge pull request #31057 from johscheuer/fix-kube-controller-manager.manifest 2016-08-20 13:00:38 -07:00
README.md Implement Azure cloud provider scripts 2016-06-17 23:46:03 -07:00
install.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00

README.md

SaltStack configuration

This is the root of the SaltStack configuration for Kubernetes. A high level overview for the Kubernetes SaltStack configuration can be found in the docs tree.

This SaltStack configuration currently applies to default configurations for Debian-on-GCE, Fedora-on-Vagrant, Ubuntu-on-AWS and Ubuntu-on-Azure. (That doesn't mean it can't be made to apply to an arbitrary configuration, but those are only the in-tree OS/IaaS combinations supported today.) As you peruse the configuration, these are shorthanded as gce, vagrant, aws, azure-legacy in grains.cloud; the documentation in this tree uses this same shorthand for convenience.

See more:

Analytics