Commit Graph

6056 Commits

Author SHA1 Message Date
Zach Loafman
b77abb5945 Merge pull request #4221 from brendandburns/pd_fix
Make gce_safe_format_and_mount actually work correctly.
2015-02-06 14:50:20 -08:00
Zach Loafman
ae6f81e24a Merge pull request #4226 from filbranden/e2e_standalone_scripts2
Turn the hack/e2e.go commands into standalone scripts.
2015-02-06 14:39:12 -08:00
Filipe Brandenburger
162d7a00b3 Fix hack/e2e.go --ctl output
Export the KUBE_CONFIG_FILE environment variable pointing to the test
output when calling cluster/kubectl.sh directly.

Tested by running:
$ go run ./hack/e2e.go -v -ctl='version --match-server-version=false'
2015-02-06 14:36:35 -08:00
Filipe Brandenburger
e63ccfff6c Reintroduce "Turn the hack/e2e.go commands into standalone scripts."
This reverts commit 2765660101,
which reverted a commit 0c7dce77dd, so
we're reintroducing the same code from that commit here.
2015-02-06 14:35:43 -08:00
Alex Robinson
21f9b83d91 Add Godeps for the Prometheus monitoring client library and its dependencies.
See issue #1625 for discussion.
2015-02-06 22:21:56 +00:00
Zach Loafman
cf39838830 Merge pull request #4224 from GoogleCloudPlatform/revert-4198-e2e_standalone_scripts
Revert "Turn the hack/e2e.go commands into standalone scripts."
2015-02-06 14:13:23 -08:00
Zach Loafman
2765660101 Revert "Turn the hack/e2e.go commands into standalone scripts." 2015-02-06 14:13:00 -08:00
Dawn Chen
8f69192be4 Merge pull request #4222 from brendandburns/status
Add some more verbose logging around pod status.
2015-02-06 13:06:12 -08:00
Robert Rati
5013375242 Converted TestKubeletSendsEvent to native ginkgo syntax #4220 2015-02-06 15:54:17 -05:00
Jeff Lowdermilk
30d5a4aac2 Merge pull request #4209 from alanwill/aws-doc-update
Updated for relevancy with the latest release and added more supporting ...
2015-02-06 12:47:01 -08:00
Brendan Burns
b527b8a9ef Add some more verbose logging around pod status. 2015-02-06 12:42:17 -08:00
Brendan Burns
3d6c9fc9e8 Fix gce_pd to only use safe_format_and_mount when mounting block devices. 2015-02-06 12:41:21 -08:00
Jeff Lowdermilk
9c7817577b Merge pull request #4200 from brendandburns/race
Add some locking to prevent go data race logic from tripping.
2015-02-06 12:29:56 -08:00
Zach Loafman
fc06acdd2b Merge pull request #4198 from filbranden/e2e_standalone_scripts
Turn the hack/e2e.go commands into standalone scripts.
2015-02-06 12:24:48 -08:00
Jeff Lowdermilk
b5cf392a00 Merge pull request #4199 from proppy/git-sync
contrib/git-sync: fix demo and doc
2015-02-06 12:20:16 -08:00
Robert Rati
cfe96c08b9 Moved kubelet_sends_events to create new events test suite #4220 2015-02-06 15:20:14 -05:00
Zach Loafman
615b1ab605 Merge pull request #4211 from rrati/e2e-networking-4179
E2e networking 4179
2015-02-06 11:26:23 -08:00
Filipe Brandenburger
0c7dce77dd Turn the hack/e2e.go commands into standalone scripts.
This gets rid of bashWrap() and of running bash -s passing it a script
on stdin. Also get rid of most of the runBash*() helpers.

In particular, `go run hack/e2e.go -build` will now work when it needs
to ask whether it is OK to download a large docker image, it used to
fail since stdin was not available for the bash script using the `read`
command.

Tested by running a full `hack/e2e-test.sh` run including the build
stage without the docker image loaded, which used to fail before this
change.
2015-02-06 11:18:14 -08:00
Robert Rati
1be4ab2aaa Moved TestImportantURLs to the networking suite #4179 2015-02-06 14:09:48 -05:00
Robert Rati
d75d36f3d3 Ported TestImportantURLs to native ginkgo syntax #4179 2015-02-06 14:09:48 -05:00
Robert Rati
a1dcec8a1c Ported TestNetwork to native ginkgo syntax #4179 2015-02-06 14:09:46 -05:00
derekwaynecarr
409abdc745 Improve test casing on resource defaults sample plugin 2015-02-06 13:50:09 -05:00
Paulo Pires
c48d5dd09f Fixed API server portal_net flag that could break service networking by setting an IP from a subnet allocated to a node. 2015-02-06 18:46:54 +00:00
Brendan Burns
35fa143b29 Revert "Revert "Start using GCE safe format and mount for mounting disks.""
This reverts commit 858a85e8fe.
2015-02-06 10:09:00 -08:00
Brendan Burns
94d852e8a6 Merge pull request #4214 from brendandburns/pd_fix
Revert "Start using GCE safe format and mount for mounting disks."
2015-02-06 09:58:51 -08:00
Brendan Burns
858a85e8fe Revert "Start using GCE safe format and mount for mounting disks."
This reverts commit 3f109d6d46.
2015-02-06 09:58:03 -08:00
Dawn Chen
05de54249f Merge pull request #4191 from simon3z/master
api: add image's id to ContainerStatus
2015-02-06 09:35:44 -08:00
Dawn Chen
8eeb2d1358 Merge pull request #4206 from saad-ali/modifyEventStruct
Modify Event struct to allow compressing multiple recurring events in to a single event
2015-02-06 09:32:50 -08:00
Filipe Brandenburger
36b063ddd0 Merge pull request #4207 from zmerlynn/gingko_flags
Move verbosity flag into driver.go, randomize specs
2015-02-06 09:21:12 -08:00
Robert Rati
6d171a458e Renamed network.go to networking.go #4179 2015-02-06 10:47:03 -05:00
Federico Simoncelli
e01df69565 api: add image's id to ContainerStatus
Sometimes for external applications it is important to identify
exactly what images are running. Since tags can be moved to point
to newer builds this information can be used to identify old images
running.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-02-06 09:01:14 -05:00
saadali
79cbcf918e Modify Event struct to allow compressing multiple recurring events in to a single event.
# *** ERROR: *** Some API files are missing the required field descriptions
# Add description tags to all non-inline fields in the following files:
#   pkg/api/v1beta1/types.go
#   pkg/api/v1beta2/types.go
#
# Your commit will be aborted unless you fix these.
#   COMMIT_BLOCKED_ON_DESCRIPTION
2015-02-05 21:50:29 -08:00
Brendan Burns
ff4c23d803 Merge pull request #4208 from brendandburns/e2e2
Revert filtering unknown pods, as I believe that it is causing e2e flakes.
2015-02-05 21:46:13 -08:00
Brendan Burns
234f951867 Revert filtering unknown pods, as I believe that it is causing e2e flakes. 2015-02-05 20:57:01 -08:00
Alan Williams
ec399f5ee8 Updated for relevancy with the latest release and added more supporting information 2015-02-05 20:21:38 -08:00
Zach Loafman
134d332793 Move verbosity flag into driver.go, randomize specs
Before we get too many suites baked, I want to get spec randomization
in, just so no one accidentally thinks things flow from top to bottom.

The random seed is printed with every run:

Random Seed: 1423194521 - Will randomize all specs

and can be reproduced using --ginkgo.seed
2015-02-05 19:49:04 -08:00
Zach Loafman
c5fcd9d568 Merge pull request #4205 from jlowdermilk/gce-kube-up
Use kubectl config -o template to get password in gce kube-up
2015-02-05 18:43:32 -08:00
Rajat Chopra
b61ea1bbf1 Fix vagrant networking. Include the master as part of overlay. And remove STP for efficiency. 2015-02-05 17:41:27 -08:00
Brendan Burns
783e1de5bb Add some locking to prevent go data race logic from tripping. 2015-02-05 17:27:58 -08:00
Brian Grant
617e1ca7de Merge pull request #3956 from proppy/go2docker
contrib: add go2docker
2015-02-05 17:24:59 -08:00
Brian Grant
d2feaade9e Merge pull request #4195 from smarterclayton/add_endpoints_to_service
Kubectl should be able to display endpoints directly and for service
2015-02-05 17:22:34 -08:00
Brian Grant
175e9caa55 Merge pull request #4194 from dchen1107/podstatus
Kubelet decides podStatus
2015-02-05 17:18:39 -08:00
Johan Euphrosine
a4dce8df3b contrib/git-sync: fix demo 2015-02-05 17:11:44 -08:00
Tim Hockin
fcb739f284 Merge pull request #4197 from brendandburns/pd
Start using GCE safe format and mount for mounting disks.
2015-02-05 17:08:54 -08:00
Brendan Burns
3f109d6d46 Start using GCE safe format and mount for mounting disks.
This removes the need for disks to be formatted.
2015-02-05 17:01:37 -08:00
Tim Hockin
7c5625b2dd Merge pull request #4120 from justinsb/fix_4118
Fix enable_cluster_dns test
2015-02-05 16:28:46 -08:00
Kennan
08a9970f70 Merge branch 'master' of https://github.com/HackToday/kubernetes 2015-02-06 08:18:06 +08:00
Kennan
903ed06774 Merge remote-tracking branch 'upstream/master' 2015-02-06 08:16:28 +08:00
Tim Hockin
ae6e25f4af Merge pull request #4001 from mikedanese/probe-result
rename probe.Status to probe.Result
2015-02-05 16:12:13 -08:00
Kennan
492e03697f Merge branch 'master' of https://github.com/HackToday/kubernetes 2015-02-06 08:10:49 +08:00