github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e83200d322
kubernetes/cluster
History
k8s-merge-robot 537dedf684 Merge pull request #24796 from johscheuer/fix-vagrant 
Automatic merge from submit-queue

Update Docker version after cockpit installation

Fixes https://github.com/kubernetes/kubernetes/issues/24530
The vagrant setup didn't worked for me because `cockpit cockpit-kubernetes` brings their own Docker version (1.7) which doesn't work and the master components doesn't come up. More information about this bug are in my [issue](https://github.com/kubernetes/kubernetes/issues/24530).

My test system:

```bash
$ uname -a                        
Darwin MyMacBook.local 15.4.0 Darwin Kernel Version 15.4.0: Fri Feb 26 22:08:05 PST 2016; root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64

$ vagrant --version                                                                                                                                                             
Vagrant 1.8.1

$ VBoxManage --version                                                                                                                                                          
5.0.16r105871
```
2016-04-28 04:38:47 -07:00
..
addons Merge pull request #24124 from vmware/photon-controller 2016-04-27 01:02:03 -07:00
aws ResourceQuota should be last admission controller 2016-04-12 13:40:52 -04:00
azure azure: add kube-down, remove need for tenant-id 2016-03-16 12:02:41 -07:00
centos Merge pull request #23829 from derekwaynecarr/fix_admission_order 2016-04-20 04:58:04 -07:00
cloudimages AWS: Update jessie image, to fix reboot issue 2016-03-05 16:57:57 -05:00
gce Merge pull request #24893 from andyzheng0831/gci 2016-04-27 23:46:26 -07:00
gke Make detect-node-names less brittle for G{C,K}E 2016-04-25 12:10:25 -07:00
images Merge pull request #23250 from huggsboson/patch-1 2016-04-25 20:23:36 -07:00
juju Unzipping the kubectl package to platforms so the validation script can find kubectl. 2016-04-01 13:19:17 -05:00
kubemark Use get-mater-size function in kubemark config 2016-03-16 17:38:55 +01:00
lib Fix spacing in usage_from_stdin and info_from_stdin (issue #24186). 2016-04-14 18:19:02 +02:00
libvirt-coreos Remove the restart-kube-proxy and restart-apiserver functions 2016-03-18 01:49:01 -07:00
mesos/docker Merge pull request #22149 from luxas/onedotsix 2016-04-05 13:26:18 -07:00
ovirt
photon-controller Initial kube-up support for VMware's Photon Controller 2016-04-25 13:24:16 -07:00
rackspace fix for https://github.com/kubernetes/kubernetes/issues/13511 2016-03-25 22:29:09 +08:00
saltbase Merge pull request #24210 from cjcullen/abacAuth 2016-04-27 16:43:08 -07:00
ubuntu Merge pull request #23829 from derekwaynecarr/fix_admission_order 2016-04-20 04:58:04 -07:00
vagrant Update Docker version after cockpit installation 2016-04-26 15:30:54 +02:00
vsphere Fix typo of "attempts" in vsphere util.sh during checks. 2016-03-10 13:05:19 -05:00
common.sh Add support for running clusters on GCI 2016-04-27 15:24:21 -07:00
get-kube-local.sh Remove -v /dev:/dev from docker and docker-multinode 2016-02-07 22:15:20 +02:00
get-kube.sh Initial kube-up support for VMware's Photon Controller 2016-04-25 13:24:16 -07:00
kube-down.sh Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh. 2016-03-08 16:51:20 -08:00
kube-push.sh Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh. 2016-03-08 16:51:20 -08:00
kube-up.sh Remove EXIT_ON_WEAK_ERROR variable 2016-03-21 12:22:03 +01:00
kube-util.sh Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh. 2016-03-08 16:51:20 -08:00
kubectl.sh Update kubectl.sh 2016-04-19 13:47:05 +02:00
log-dump.sh Also collect docker supervisor logs. 2016-04-07 13:05:11 -07:00
options.md Minion->Name rename: cluster/vagrant, docs and Vagrantfile 2015-12-02 12:45:12 -08:00
OWNERS Move blunderbuss assignees into tree 2016-03-02 20:46:32 -05:00
README.md Add ga-beacon analytics to gendocs scripts 2015-05-15 18:56:38 -07:00
test-e2e.sh Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh. 2016-03-08 16:51:20 -08:00
test-network.sh Add newline to the end of bash scripts 2015-09-18 19:35:05 +03:00
test-smoke.sh Support passing args to cluster/test-smoke.sh 2015-10-09 14:44:23 -07:00
update-storage-objects.sh Test jobs/hpas in storage update 2016-03-04 17:05:39 -05:00
validate-cluster.sh validate-cluster.sh: Don't use ignored and deprecated option '--api-version' 2016-03-17 12:49:21 -03:00

README.md

Cluster Configuration

The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.

See the getting-started guides for examples of how to use the scripts.

cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.

The heavy lifting of configuring the VMs is done by SaltStack.

Analytics