Commit Graph

313 Commits

Author SHA1 Message Date
Zach Loafman
a0b8fd618f Bump GCE to container-vm-v20170117
Base image update only, no kubelet or Docker updates.
2017-01-18 10:50:17 -08:00
Yifan Gu
dd59aa1c3b cluster/gce: Rename coreos to container-linux. 2016-12-30 15:32:02 -08:00
Michael Taufen
fe4552057e Allow GCI_VERSION to come from env
This is to facilitate GCI tip vs. K8s tip testing; we need to
dynamically set the version of GCI to stay current with their
latest canary (latest of the "gci-base" prefixed images).
2016-12-12 11:19:56 -08:00
Tim St. Clair
759e9f5370
Bump Container VM to latest version
- Enables kernel softlockup detection
- Removes iSCSI support
2016-12-08 18:25:18 -08:00
Dawn Chen
38a63e388d Set kernel.softlockup_panic =1 based on the flag. 2016-12-02 16:09:16 -08:00
Kubernetes Submit Queue
1570aad238 Merge pull request #37451 from jszczepkowski/ha-read-quorum
Automatic merge from submit-queue

Added setting etcd read quorum flag
2016-12-01 06:31:24 -08:00
Jerzy Szczepkowski
02542cae06 Added setting etcd read quorum flag.
Added setting etcd read quorum flag in kube-up scripts. Required for HA master.
2016-11-25 13:53:11 +01:00
Jan Safranek
b52d971aee stash 2016-11-21 10:16:29 +01:00
David Ashpole
10f73bde27 added eviction minimum reclaim flags to test flags, and changed gce default config for eviction-hard to match what tests are using 2016-11-18 08:48:40 -08:00
Michael Taufen
6c5b4761c8 K8s 1.5 keeps container-vm as default node image on GCE
There is a concern that some GCE users may be running automation that
(a) turns up ephemeral clusters and (b) always uses the latest K8s
release. If any of these workloads fall outside the set supported on
GCI, cutting the release will break the automation. We are therefore
delaying this change until we have provided sufficient warning.
2016-11-15 08:34:10 -08:00
Michael Taufen
a38c61395e Bump GCI version to gci-dev-56-8977-0-0 2016-11-11 16:00:18 -08:00
Zihong Zheng
b26faae7fc Migrates addons from using ReplicationControllers to Deployments 2016-11-09 09:17:05 -08:00
Kubernetes Submit Queue
a0c34eee35 Merge pull request #33239 from MrHohn/dns-autoscaler
Automatic merge from submit-queue

Deploy kube-dns with cluster-proportional-autoscaler

This PR integrates [cluster-proportional-autoscaler](https://github.com/kubernetes-incubator/cluster-proportional-autoscaler) with kube-dns for DNS horizontal autoscaling. 

Fixes #28648 and #27781.
2016-11-07 19:31:31 -08:00
Zihong Zheng
d961190e6f Deployed DNS horizontal autoscaler as an addon
DNS horizontal autoscaling feature is turned on by default on gce.
The corresponding env var is piped into almost all other cloud
providers.
2016-11-07 10:44:44 -08:00
Wojciech Tyczynski
3ca1f06149 Prepare for easy change to etcd3 storage backend 2016-11-04 13:46:01 +01:00
Michael Taufen
2e8718fb9e Bump GCI version to gci-dev-56-8938-0-0 for k8s v1.5 2016-10-30 11:14:42 -07:00
Dawn Chen
b29115658f Bump GCE debian image to container-vm-v20161025 (CVE-2016-5195 (Dirty COW)) 2016-10-28 14:23:49 -07:00
David Ashpole
eb19713486 kubelet calls GetDirFsInfo(root directory) instead of using GetFsInfo(root label). Reverted #33520, and changed e2e test context to use nodefs 2016-10-27 08:04:59 -07:00
Maisem Ali
d3163c93f4 Updating the GCI image to gci-dev-55-8872-18-0. 2016-10-20 15:59:08 -07:00
Jeff Grafton
661d6bde6f Delete all firewall rules and network on GCE/GKE test cluster teardown 2016-10-12 15:46:06 -07:00
Kubernetes Submit Queue
8bcb85685e Merge pull request #34156 from adityakali/gci
Automatic merge from submit-queue

Update GCI_VERSION to gci-dev-55-8866-0-0

Update GCI base image:

Change log:
* Built-in kubernetes updated to v1.4.0
* Enabled VXLAN and IP_SET config options in kernel to support some networking tools
* OpenSSL CVE fixes

```release-note
Update GCI base image:
* Enabled VXLAN and IP_SET config options in kernel to support some networking tools (ebtools)
* OpenSSL CVE fixes
```

cc/ @kubernetes/goog-image cc/ @dchen1107
2016-10-07 16:35:20 -07:00
Kubernetes Submit Queue
86c322e014 Merge pull request #33520 from vishh/33444
Automatic merge from submit-queue

Nodefs becomes imagefs on GCI

Kubelet cannot identify rootfs correctly
For #33444

```release-note
Enforce Disk based pod eviction with GCI base image in Kubelet
```

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-06 17:37:33 -07:00
Aditya Kali
11397e0f6d Update GCI_VERSION to gci-dev-55-8866-0-0
Changelog:
* Built-in kubernetes updated to v1.4.0
* Enabled VXLAN and IP_SET config options in kernel to support some networking tools
* OpenSSL CVE fixes
2016-10-06 15:43:29 -07:00
Lucas Käldström
950e23740b Remove the old flannel network mode in kube-up 2016-10-04 12:02:25 +03:00
Vishnu kannan
e7633d8328 nodefs becomes imagefs on GCI since kubelet cannot identify rootfs correctly
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-09-26 15:27:49 -07:00
Justin Santa Barbara
a6dfaffe3f Fix typo: incremeting -> incrementing 2016-09-24 16:10:51 -04:00
Vishnu kannan
ef49584603 Switch k8s on GCE to use GCI by default
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-09-22 21:11:13 -07:00
Kubernetes Submit Queue
03c698ce44 Merge pull request #33194 from dchen1107/master
Automatic merge from submit-queue

Update the containervm image to the latest one (container-v1-3-v20160…

Node e2e is running with old containervm image which only has docker 1.9.1. This pr fixed such issue.
2016-09-21 20:40:02 -07:00
Dawn Chen
f1f16fe03a Update the containervm image to the latest one (container-v1-3-v20160604). 2016-09-21 10:24:22 -07:00
Kubernetes Submit Queue
6fd94968e1 Merge pull request #32738 from Amey-D/gci-version-v1.4
Automatic merge from submit-queue

Bump up GCI version.

```release-note
   Upgrading Container-VM base image for k8s on GCE. Brief changelog as follows:
    - Fixed performance regression in veth device driver
    - Docker and related binaries are statically linked
    - Fixed the issue of systemd being oom-killable
```

Fixes #32596

This needs a cherrypick into v1.4 release branch because it is fixing v1.4 release blocking issues. This patch is easy and safe to rollback in case of emergencies.

@vishh can you please review?

Fixes #32596 and many other issues.
cc/ @kubernetes/goog-image  FYI
2016-09-20 16:30:01 -07:00
Amey Deshpande
5da8486758 Bump up GCI version.
Brief changelog compared to gci-dev-54-8743-3-0:
- Fixed performance regression in veth device driver
- Docker and related binaries are statically linked
- Fixed the issue of systemd being oom-killable
- Updated built-in kubelet version to 1.3.7
- add ethtool and ebtables binaries expected by kubelet

Fixes #32596
2016-09-20 13:59:31 -07:00
Kubernetes Submit Queue
87c2650038 Merge pull request #32873 from jszczepkowski/ha-delete-nodes2
Automatic merge from submit-queue

Implemented KUBE_DELETE_NODES flag in kube-down.

Implemented KUBE_DELETE_NODES flag in kube-down script.
It prevents removal of nodes when shutting down a HA master replica.
2016-09-19 01:08:18 -07:00
Michael Taufen
2a536bf6f5 Revert "Merge pull request #31023 from vishh/gci-default"
This reverts PR #31023, which had made GCI the default node image for
open source. This revert makes container-vm the default for open source again.
2016-09-16 15:16:53 -07:00
Jerzy Szczepkowski
58c8992590 Implemented KUBE_DELETE_NODES flag in kube-down.
Implemented KUBE_DELETE_NODES flag in kube-down script.
It prevents removal of nodes when shutting down a HA master replica.
2016-09-16 16:51:52 +02:00
Kubernetes Submit Queue
d1569489a3 Merge pull request #31545 from vishh/inodes-eviction
Automatic merge from submit-queue

Enable kubelet eviction whenever inodes free is < 5% on GCE

This is a pre-req for enabling inodes based evictions in GKE.
2016-09-07 12:49:46 -07:00
gmarek
3e2c3a5db2 Make image-puller work on GCI nodes. 2016-09-07 15:23:39 +02:00
Kubernetes Submit Queue
243959ce5a Merge pull request #32020 from euank/version-twiddling
Automatic merge from submit-queue

rkt: Update kube-up rkt version to v1.14.0

cc @kubernetes/sig-rktnetes 

This should have been included in #31286 (whoops).

This is a bugfix that I propose for v1.4 inclusion.
2016-09-07 01:18:57 -07:00
Euan Kemp
a2a324bf8b cluster/rkt: Update default rkt version 2016-09-06 12:09:11 -07:00
Piotr Szczesniak
9ce2ad3f4c Enable Rescheduler by default 2016-09-02 15:53:57 +02:00
Amey Deshpande
6a2201f410 Pick a specific GCI version by default on GCE.
Prior to this change, a K8s branch (master as well as release) was
pinned to a GCI milestone.  It would pick up the latest GCI release on
that milestone at the time of cluster creation.  The rationale was the
K8s users would automatically get the bug fixes in newer versions of
GCI.  However in practice, it makes the runtime environment
non-deterministic, and lack of continuous e2e tests mean we would run
into breakages sooner or later.

With this change, each K8s release will pick a specific version
of GCI by default (similar to how the Debian-based container-vm gets used).
Users can override the default version through KUBE_GCE_MASTER_IMAGE and
KUBE_GCE_NODE_IMAGE environment variables.

We expect the default GCI version will be updated relatively frequently stay
updated with newer GCI releases.  We can also automate the process to
automatically bump the hard-coded GCI version in future.
2016-08-31 17:26:00 -07:00
Kubernetes Submit Queue
1b38ba6d8f Merge pull request #31023 from vishh/gci-default
Automatic merge from submit-queue

Use upgraded container-vm by default on worker nodes for GCE k8s clusters

For https://github.com/kubernetes/kubernetes/issues/25276
Depends on https://github.com/kubernetes/test-infra/pull/417
2016-08-26 14:32:07 -07:00
Vishnu kannan
1e51efe02b enable kubelet eviction whenever inodes free is < 5% on GCE
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-08-26 12:56:30 -07:00
Kubernetes Submit Queue
ef2718620c Merge pull request #30900 from jsafrane/pvc-admission
Automatic merge from submit-queue

Add admission controller for default storage class.

The admission controller adds a default class to PVCs that do not require any
specific class. This way, users (=PVC authors) do not need to care about
storage classes, administrator can configure a default one and all these PVCs
that do not care about class will get the default one.

The marker of default class is annotation "volume.beta.kubernetes.io/storage-class", which must be set to "true" to work. All other values (or missing annotation) makes the class non-default.

Based on @thockin's code, added tests and made it not to reject a PVC when no class is marked as default.
. 
@kubernetes/sig-storage
2016-08-24 03:32:46 -07:00
Marcin Wielgus
11fabd7176 Scheduling algorithm provider flag in kube-up.sh 2016-08-22 17:49:00 +02:00
Jan Safranek
5f6efefc40 [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
Kubernetes Submit Queue
010c976ce8 Merge pull request #30468 from jlowdermilk/feature-config
Automatic merge from submit-queue

Feature gates for kube-system components

Implements [this proposal](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/runtimeconfig.md). Adds `--feature-gates` to apiserver, scheduler, controller-manager and proxy.

cc @lavalamp @adityakali
2016-08-19 18:15:19 -07:00
Kubernetes Submit Queue
3fab894d06 Merge pull request #30901 from ronnielai/percent1
Automatic merge from submit-queue

Enable pod eviction due to disk pressure in GCE.
2016-08-19 15:46:11 -07:00
Vishnu kannan
ff7076060c Switch to using gci by default for GCE k8s clusters
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-08-19 13:23:44 -07:00
Jeff Lowdermilk
51198f59da Add --feature-gates to kube-system components
apiserver,scheduler,controller-manager,proxy,kubelet all get
flag. Using one variable to plumb through config via salt/init
scripts for GCE and GKE
2016-08-19 09:07:43 -07:00
bindata-mockuser
4cddbccd43 Enable pod eviction due to disk pressure (default threshold is 10%) in GCE. 2016-08-18 10:11:28 -07:00
Jan Safranek
82d35fb461 Add admission controller for default storage class.
The admission controller adds a default class to PVCs that do not require any
specific class. This way, users (=PVC authors) do not need to care about
storage classes, administrator can configure a default one and all these PVCs
that do not care about class will get the default one.
2016-08-18 18:55:35 +02:00
Piotr Szczesniak
1f3fdab063 Salt configuration for Rescheduler 2016-08-18 12:24:09 +02:00
Wojciech Tyczynski
679afea360 etcd3 support 2016-08-10 13:33:35 +02:00
Zach Loafman
963a05ec72 AWS/GCE: Rework use of master name
* Add a pillar for hostname (because even if there's a good Salt
function for it, I don't trust it to return the short hostname)
* Move INITIAL_ETCD_CLUSTER to just the GCE turn-up
* Remove the master_name, which isn't needed as a pillar
2016-08-04 08:46:36 -07:00
Filip Grzadkowski
e9585fba91 1. Precompute REGION variable in config
2. Add timeout for waiting for loadbalancer
3. Fix kube-down so that it doesn't delete some resources if there are still masters/nodes in other zones
2016-07-20 17:25:25 +02:00
Maisem Ali
97f3f80833 Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and
MASTER_OS_DISTRIBUTION.
2016-07-15 12:02:31 -07:00
David McMahon
ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
k8s-merge-robot
272042f3e6 Merge pull request #26017 from caseydavenport/cd-calico-policy
Automatic merge from submit-queue

Add Calico as policy provider in GCE

Adds Calico as policy provider to GCE, enforcing the extensions/v1beta1 NetworkPolicy API.

Still to do:
- [x] Enable NetworkPolicy API when POLICY_PROVIDER is provided.
- [x] Fix CNI plugin, policy controller versions.

CC @thockin - does this general approach look good?
2016-06-25 03:43:59 -07:00
Yifan Gu
30c913e211 rkt: Bump required rkt version to 1.9.1. 2016-06-24 13:54:32 -07:00
Yifan Gu
fc31c8d6f0 cluster/gce: Preload rkt stage1 images and set the default --rkt-stage1-image. 2016-06-20 10:39:46 -07:00
Madhusudan.C.S
fac6f1c379 Add Google Cloud DNS auth scope to GCE VMs when they are started in a federation. 2016-06-14 05:26:56 -07:00
Marcin Wielgus
8b09074d2c Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER 2016-06-09 11:30:57 +02:00
Marcin Wielgus
edf21902b5 Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 1 2016-06-08 13:35:38 +02:00
k8s-merge-robot
a283a0a759 Merge pull request #26828 from vishh/oom-kill-enable
Automatic merge from submit-queue

Enable support for memory eviction configuration via salt

Added evictions based on memory by default whenever the available memory is < 100Mi.

Updated GCE and GCI.
2016-06-07 21:12:50 -07:00
k8s-merge-robot
bae931204c Merge pull request #26990 from mwielgus/ca-0.1.2
Automatic merge from submit-queue

Bump cluster autoscaler version and enable scale down by default

Follow up of https://github.com/kubernetes/contrib/pull/1148. 

cc: @piosz @fgrzadkowski @jszczepkowski
2016-06-07 19:42:19 -07:00
Marcin Wielgus
c191c72063 Bump cluster autoscaler version and enable scale down by default 2016-06-07 21:42:56 +02:00
Vishnu kannan
b120ce98f1 Set hard memory eviction thresholds for GCE clusters.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-06-06 17:26:11 -07:00
k8s-merge-robot
98c432a943 Merge pull request #25841 from ojarjur/ojarjur/registry-mirror
Automatic merge from submit-queue

GCE: Enable using gcr.io as a Docker registry mirror.

```release-note
Use gcr.io as a Docker registry mirror when setting up a cluster in GCE.
```
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

This only affects clusters running under GCE.
2016-06-06 14:50:05 -07:00
Zach Loafman
20408cad17 Bump GCE debian image to container-v1-3-v20160604
Includes Docker 1.11.2

Wait for enough results from
http://kubekins.dls.corp.google.com/job/kubernetes-e2e-gce-container-vm/
before merging.

c.f. https://github.com/kubernetes/test-infra/pull/116
2016-06-04 20:46:46 -07:00
k8s-merge-robot
e0707b137f Merge pull request #26827 from Random-Liu/re-enable-node-problem-detector
Automatic merge from submit-queue

Re-enable node problem detector by default

Re-enable node problem detector started in gce cluster by default.

For now, in the master node, the node problem detector will be started and do nothing (see https://github.com/kubernetes/node-problem-detector/pull/13).

But in fact, in my test cluster, the master has no extra cpu to run the node problem detector, so node problem detector is started on all nodes except master, which is what we want but not expected...

@dchen1107 
/cc @kubernetes/sig-node 
/cc @andyzheng0831 for the gci script change.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-04 12:33:58 -07:00
Random-Liu
7dffea0dc0 Re-enable node problem detector by default 2016-06-03 17:47:50 -07:00
Casey Davenport
35289c7649 Update salt to use latest Calico 2016-06-03 13:07:00 -07:00
Matt Dupre
19be49124b Add new policy_provider option to Salt; supporting Calico installation 2016-06-03 13:06:42 -07:00
Daniel Wang
a8701baf17 Move the defaults setting of GCI to util.sh
This change recovers some of the side effects of
https://github.com/kubernetes/kubernetes/pull/26197, i.e., keeps the defaults of
`NODE_IMAGE` and `NODE_IMAGE_PROJECT` to `MASTER_IMAGE` and
`MASTER_IMAGE_PROJECT`, for backward compatibility. Although it keeps
`OS_DISTRIBUTION` defaulting to `gci`, the default settings of these vars are
moved to `cluster/gce/util.sh` and conditioned on `OS_DISTRIBUTION==gci`.
2016-06-01 15:37:02 -07:00
k8s-merge-robot
dc8ff81f5a Merge pull request #26534 from mwielgus/scale_down_env
Automatic merge from submit-queue

Allow to enable scale down in kube-up for gce

cc: @piosz @fgrzadkowski @jszczepkowski
2016-05-31 04:37:11 -07:00
Marcin
0b7c2fa6fe Allow to enable scale down in kube-up for gce 2016-05-30 17:07:54 +02:00
Alex Robinson
804e36be26 Merge pull request #26157 from gmarek/poll
Remove unused POLL_SLEEP_INTERVAL
2016-05-27 11:30:41 -07:00
Alex Mohr
1dfa068055 Merge pull request #26384 from Random-Liu/disable-node-problem-detector
Temporarily disable node-problem-detector to unblock #26351
2016-05-26 15:53:50 -07:00
Random-Liu
e5320c6063 Temporarily disable node-problem-detector to unblock #26351 2016-05-26 14:06:05 -07:00
Dawn Chen
16662d8fb4 Bump Node Image to container-v1-3-v20160517 2016-05-26 13:30:56 -07:00
Daniel Wang
3d95151971 Replace containervm with GCI as default master image for GCE clusters 2016-05-24 17:28:17 -05:00
Omar Jarjur
338b33f3f4 Enable using gcr.io as a Docker registry mirror.
This only affects clusters running under GCE.
2016-05-24 08:12:48 -07:00
gmarek
049d7f6c50 Remove unused POLL_SLEEP_INTERVAL 2016-05-24 13:34:03 +02:00
k8s-merge-robot
fe15db60f4 Merge pull request #25986 from Random-Liu/enable-node-problem-detector
Automatic merge from submit-queue

Add node problem detector as an addon pod.

```release-note
Introduce a new add-on pod NodeProblemDetector.

NodeProblemDetector is a DaemonSet running on each node, monitoring node health and reporting
node problems as NodeCondition and Event. Currently it already supports kernel log monitoring, and
will support more problem detection in the future. It is enabled by default on gce now.
```

This PR enables NodeProblemDetector as an add-on pod.

/cc @mikedanese @kubernetes/sig-node 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-22 06:17:28 -07:00
Mike Danese
3e5c77efea Merge pull request #25545 from freehan/kubeneton
Turn on kubenet for GCE
2016-05-20 16:38:22 -07:00
Minhan Xia
592d672b6b Turn on kubenet as default for GCE 2016-05-20 16:36:53 -07:00
Random-Liu
195e2494ad Add node problem detector as an addon pod. 2016-05-20 13:54:19 -07:00
Jerzy Szczepkowski
858eb0388e Added enforcing of setting nodes numbers for cluster autoscaler.
Added enforcing of setting nodes numbers for cluster autoscaler in kube-up script.
2016-05-17 13:15:49 +02:00
k8s-merge-robot
aada051b20 Merge pull request #25357 from mwielgus/ca-salt
Automatic merge from submit-queue

Salt configuration for the new Cluster Autoscaler for GCE

Adds support for cloud autoscaler from contrib/cloud-autoscaler in kube-up.sh GCE script.

cc: @fgrzadkowski @piosz
2016-05-15 11:35:19 -07:00
Jeff Lowdermilk
1d67b6ca81 Merge pull request #24617 from pnegahdar/dn_server_config
Allow DNS_SERVER_IP and DNS_DOMAIN to be configurable in GCE deploy
2016-05-13 10:05:36 -07:00
Marcin Wielgus
ac4b380453 Salt configuration for the new Cluster Autoscaler for GCE 2016-05-13 17:04:24 +02:00
gmarek
5dc3d50aba Change default clusterCIDRs to /14 2016-05-10 12:44:49 +02:00
Parham Negahdar
3575ab0736 Allow KUBE_DNS_SERVER_IP and DNS_DOMAIN to be configurable in GCE deploy 2016-04-21 16:13:07 -04:00
derekwaynecarr
e3d58499db ResourceQuota should be last admission controller 2016-04-12 13:40:52 -04:00
Zach Loafman
b2cf4b8c11 Bump to container-vm-v20160321 2016-03-21 17:42:34 -07:00
Mike Danese
2d3b8ab1eb enable master kubelet in gce-default to match gce-test 2016-03-08 11:14:15 -08:00
Zach Loafman
60e1fccc7f Regional registries: Hack the manifests!
Allow the gcr.io/google_containers registry to be overridden
regionally by just blasting a new KUBE_ADDON_REGISTRY out. Instead of
adding every addon to Salt and asking all of the other consumers
(Trusty, Juju, Mesos, etc) to change, just script the sed ourselves.

This is probably the 9th grossest thing I've ever done, but it works
well, and it works quickly. I kind of wish it didn't.
2016-03-04 20:00:54 -08:00
Abhi Shah
4d599ea309 Merge pull request #22261 from gmarek/kube-up
kube-up for GCE chooses master size based on number of nodes
2016-03-04 10:55:12 -08:00
Abhi Shah
bfe4896b00 Merge pull request #22043 from roberthbailey/cluster-name
Add the GCE cluster name to instance metadata
2016-03-04 10:43:39 -08:00
Abhi Shah
05ba8ca7fa Merge pull request #22170 from metmajer/master
Pass through EXTRA_DOCKER_OPTS.
2016-03-04 10:40:17 -08:00