github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b97367034469693c2e64018de945f2002badaabf
kubernetes/cluster
History
k8s-merge-robot 51203dad7a Merge pull request #25763 from andyzheng0831/gci-image 
Automatic merge from submit-queue

GCI: Fix the condition for using the default image

This PR revises the condition for using the default GCI image. The old logic is not convenient for manually run e2e tests in some cases (mainly for GCI team to test custom images). The new logic by this PR is very similar to the logic in using ContainerVM. When setting distro to "gci", if master or node image is unset, we use gci-dev for it. If either is set, we respect it.

@roberthbailey @zmerlynn @dchen1107 please review it, and we should cherry pick it in release-1.2 branch. Thanks!

cc/ @kubernetes/goog-image @adityakali FYI
2016-05-17 22:55:41 -07:00
..
addons
Merge pull request #25309 from keontang/es-patch
2016-05-16 01:01:24 -07:00
aws
Merge pull request #24464 from matthewrudy/aws-ap-northeast2
2016-05-17 04:01:39 -07: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 #25763 from andyzheng0831/gci-image
2016-05-17 22:55:41 -07:00
gke
Merge pull request #25173 from ixdy/gcloud-grep-awk-cut
2016-05-15 07:46:28 -07:00
images
Merge pull request #25693 from luxas/fix_hyperkube
2016-05-17 04:01:43 -07:00
juju
cluster/juju: Updated the url for the getting started doc
2016-05-16 20:56:17 +01:00
kubemark
Fix default arguments in kubemark
2016-05-11 13:10:12 +02: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
openstack-heat
Automatically detect swift URL if not specified
2016-05-05 23:58:43 +02: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
Bumped cluster autoscaler version.
2016-05-17 09:44:48 +02:00
ubuntu
Automatically download the latest stable release version of
2016-05-16 13:52:10 -07:00
vagrant
Merge pull request #25402 from kubevirt/master
2016-05-16 00:04:00 -07:00
vsphere
Fixes to allow Kubernetes dashboard (UI) to work
2016-04-27 13:30:21 -07:00
common.sh
Merge pull request #25357 from mwielgus/ca-salt
2016-05-15 11:35:19 -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
Merge pull request #25366 from Jollyturns/ubuntu-download-latest
2016-05-16 16:59:37 -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
Mark kube-push.sh as broken
2016-05-03 10:53:33 -07:00
kube-up.sh
Improved user experience for users of OpenStack provider behind a proxy.
2016-04-28 14:06:29 +02: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
Remove myself from a bunch of OWNERS files, as I am too overloaded
2016-05-11 13:34:51 -07: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
Add retries to validate-cluster
2016-04-22 09:54:51 -07: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