mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-02 23:02:25 +00:00

Files

k8s-merge-robot 794dcc14f2 Merge pull request #28040 from ibm-contribs/fixaddons

Automatic merge from submit-queue

Tracked addition of federation, sed support in kube DNS

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

The kube DNS app recently gained support for federation (whatever that
is), including a new Salt parameter.  This broke the deployAddons.sh script for cluster ubuntu.  The DNS app also gained alternate
templates, intended to be friendly to `sed`.  Fortunately, those do
not demand a federation parameter.

This PR fixes up the ` cluster/ubuntu/deployAddons.sh` script to track those changes, by switching to the `sed`-friendly templates.

2016-06-25 00:43:10 -07:00

pillar

…

reactor

…

salt

Merge pull request #28040 from ibm-contribs/fixaddons

2016-06-25 00:43:10 -07:00

install.sh

Copy and display source location prominently on Kubernetes instances

2016-06-23 15:27:38 -07:00

README.md

…

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, and Ubuntu-on-AWS. (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 in grains.cloud; the documentation in this tree uses this same shorthand for convenience.

See more: