Commit Graph

31911 Commits

Author SHA1 Message Date
k8s-merge-robot
4da14c8a64 Merge pull request #28204 from thockin/cleanup-third_party
Automatic merge from submit-queue

Cleanup third party (pt 2)

Move forked-and-hacked golang code to the forked/ directory.  Remove ast/build/parse code that is now in stdlib.  Remove unused shell2junit
2016-07-07 12:13:14 -07:00
k8s-merge-robot
8601530bdd Merge pull request #28460 from wojtek-t/remove_cmd_integration
Automatic merge from submit-queue

Remove cmd/integration test

Fix #24440

After few cleanup PRs:
https://github.com/kubernetes/kubernetes/pull/27182
https://github.com/kubernetes/kubernetes/pull/27535
https://github.com/kubernetes/kubernetes/pull/26016

The only things that are being tested here is:
- starting master components without any verification (so if it didn't start, it will still work :P)
- checking if kubelet is starting containers from http manifest.

The latter is already tested in:
https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/config/http_test.go#L54

So the test is now useless, at the same time, significantly increasing time spent on integration tests.

@lavalamp @mikedanese @spxtr @fejta
2016-07-07 11:36:19 -07:00
k8s-merge-robot
569008809f Merge pull request #28375 from duglin/removeContinue
Automatic merge from submit-queue

Remove unneeded continute

very minor but I noticed and it and it bugged me :-)

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-07-07 11:36:13 -07:00
k8s-merge-robot
51653073ec Merge pull request #25538 from duglin/fixErr
Automatic merge from submit-queue

s/positive/negative/ in the error message


I think we meant to imply that "if the error isn't real" then update the
exceptions file - which to me means "false negative", ie. false failure.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-07-07 11:36:07 -07:00
Lorrin Nelson
85589b406b Fix unintentional grammatical double-negative in error message when Docker not found on OS X. 2016-07-07 11:26:30 -07:00
Lorrin Nelson
d0e36819a4 Fix build on OS X when GNU sed is present.
See #20147, which fixed it when system default BSD sed was present but did not account for possibiliyt of GNU sed on OS X.
2016-07-07 11:26:30 -07:00
allenmiller
727bd438de Remove unbalanced right-paren 2016-07-07 11:06:01 -07:00
k8s-merge-robot
939b98481e Merge pull request #28448 from thockin/gce-pd-discard
Automatic merge from submit-queue

Mount r/w GCE PD disks with -o discard

As per https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting.

Fixes #23258
2016-07-07 11:01:43 -07:00
derekwaynecarr
c162fec94d Move ActiveDeadlineSeconds to use lifecycle observers 2016-07-07 13:43:55 -04:00
k8s-merge-robot
3895cede49 Merge pull request #28434 from thockin/br-netfilter-warning
Automatic merge from submit-queue

Remove br_netfilter warning in kube-proxy

Many distros have this module linked in, generating a spurious error.

Fixes #23385
2016-07-07 10:27:20 -07:00
Casey Davenport
ea4be05cab Update API reference docs 2016-07-07 10:06:12 -07:00
Casey Davenport
aeb03d09c4 Update generated swagger spec. 2016-07-07 10:04:46 -07:00
Casey Davenport
097e186e84 Remove --runtime-config logic from kube-up 2016-07-07 10:04:46 -07:00
Casey Davenport
988359d0fe Enable extensions/v1beta1/NetworkPolicy by default 2016-07-07 10:04:46 -07:00
k8s-merge-robot
32e5996d57 Merge pull request #28447 from k82/k8s-26930-km-local-path
Automatic merge from submit-queue

MESOS: Support a pre-installed km binary at a well known, agent-local path

fixes #26930
2016-07-07 09:53:30 -07:00
k8s-merge-robot
05cbaa9900 Merge pull request #28151 from mbohlool/master
Automatic merge from submit-queue

Represent unversioned.Time correctly in swagger spec

unversioned.Time previously represented as "string" type with no format while the correct representation should also have "date-time" as format. fixes #2968
2016-07-07 09:53:25 -07:00
k8s-merge-robot
33242b95d6 Merge pull request #27077 from mikedanese/faster-integration-tests
Automatic merge from submit-queue

break integration tests into seperate packages so that they run in parallel

If this is broken then our tests aren't threadsafe.

ref #25940
2016-07-07 09:21:08 -07:00
derekwaynecarr
4e6a52d872 Enable memory eviction by default 2016-07-07 11:47:16 -04:00
Klaus Ma
b361f40009 Enable km to use local km in agent. 2016-07-07 23:39:11 +08:00
k8s-merge-robot
ec6181d5d3 Merge pull request #25036 from kargakis/validate-generation-update
Automatic merge from submit-queue

api: validate generation updates

@bprashanth @liggitt PTAL
2016-07-07 08:06:51 -07:00
Andrea Cosentino
5d9b21a77a Fixed a little typo in Cassandra example Readme 2016-07-07 17:03:31 +02:00
k8s-merge-robot
a1501fde66 Merge pull request #28550 from janetkuo/e2e-deployment-rollover-log
Automatic merge from submit-queue

Log available pods of deployments when scaling down old RS

Ref #26834


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-07 07:33:30 -07:00
k8s-merge-robot
e232ecd201 Merge pull request #28498 from endocode/kayrus/fix_kuberoot
Automatic merge from submit-queue

build: fixed ${KUBE_ROOT} prefix for build scripts

Running `./make-build-image.sh` command inside the `build` directory doesn't work:

```sh
$ cd build
$ ./make-build-image.sh 
./../build/common.sh: line 32: hack/lib/init.sh: No such file or directory
```

This PR adds `${KUBE_ROOT}` prefix for the `source` bash function. Also I added braces to unify the code style.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-07 07:33:25 -07:00
k8s-merge-robot
38ac367d6f Merge pull request #27901 from jfrazelle/clean-hack-dockerfiles
Automatic merge from submit-queue

Cleanup hack/ Dockerfiles

<!--
Checklist for submitting a Pull Request

Please remove this comment block before submitting.

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
3. If you want this PR to automatically close an issue when it is merged,
   add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>`
   to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests).
4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.
-->

```release-note
Small improvements to hack/ Dockerfiles
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-07 07:33:20 -07:00
Wojciech Tyczynski
31538db145 Avoid growing slices 2016-07-07 15:54:39 +02:00
Maciej Szulik
79028c4e3b Added test case covering pending pods in syncJob 2016-07-07 14:45:34 +02:00
Wojciech Tyczynski
6c77c01f24 Avoid copying nodes in priority functions 2016-07-07 14:38:09 +02:00
Wojciech Tyczynski
7219802ac7 Pass pointer to node in NodCondition 2016-07-07 14:10:17 +02:00
Michail Kargakis
93c2656d5a api: validate generation updates 2016-07-07 13:09:48 +02:00
Wojciech Tyczynski
58c95c136f Quick returns in predicates 2016-07-07 12:34:54 +02:00
Sylwester Brzeczkowski
19434e1b58 24133 fix: --no-headers works with custom columns now 2016-07-07 10:04:09 +02:00
Mike Danese
81e67c0403
update docs
Signed-off-by: Mike Danese <mikedanese@google.com>
2016-07-07 00:54:23 -07:00
Mike Danese
13f36d5117
delete some dead code
Signed-off-by: Mike Danese <mikedanese@google.com>
2016-07-07 00:54:19 -07:00
Mike Danese
f3de21bdf0
move integration tests into individual pacakges
Signed-off-by: Mike Danese <mikedanese@google.com>
2016-07-07 00:54:15 -07:00
k8s-merge-robot
acda24ae25 Merge pull request #27805 from janetkuo/change-redis-image-gcr
Automatic merge from submit-queue

Change redis image gcr

Follow up https://github.com/kubernetes/kubernetes/pull/27577#discussion_r67809871:
> Any chance we can move these images somewhere in gcr.io?

I pushed `kubernetes/redis:v1` to `gcr.io/google_containers/redis:v1`.  


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-07 00:53:44 -07:00
k8s-merge-robot
3832b32d08 Merge pull request #27501 from ronnielai/test1
Automatic merge from submit-queue

Log all image deletion errors instead of just the last one

#27169
2016-07-07 00:53:39 -07:00
k8s-merge-robot
2da247ffbc Merge pull request #26977 from joe2far/fix-help-strings
Automatic merge from submit-queue

Make kubectl help strings consistent
2016-07-07 00:12:22 -07:00
lixiaobing10051267
9915e89107 The notes are in reverse order 2016-07-07 14:45:16 +08:00
k8s-merge-robot
8741217179 Merge pull request #28547 from elyscape/completion-docs
Automatic merge from submit-queue

Reformat kubectl completion example text
2016-07-06 23:37:06 -07:00
k8s-merge-robot
bb763df8d5 Merge pull request #28530 from lixiaobing10051267/msterwascreated
Automatic merge from submit-queue

"was not created" should be "was created"

In file pkg\client\restclient/request_test.go, line #1089, "t.Errorf("expected object was not created")" , here "was not created" should be "was created" because the if condition is "if wasCreated".
2016-07-06 23:37:02 -07:00
k8s-merge-robot
bfa5d3027c Merge pull request #28479 from lixiaobing10051267/masterbuild
Automatic merge from submit-queue

delete the redundant word "a"

In file docs/reporting-security-issues.md, line #37, "If you believe you have discovered a vulnerability or a have a security incident to report", here the second "a" is redundant, should be deleted.
2016-07-06 23:36:58 -07:00
k8s-merge-robot
f3d0d147eb Merge pull request #28305 from jlowdermilk/kubectl-convert-noise
Automatic merge from submit-queue

kubectl convert --local prints info message to stderr

fix #28298
2016-07-06 23:36:53 -07:00
k8s-merge-robot
0c696dc95b Merge pull request #27848 from liubin/fix-typos
Automatic merge from submit-queue

fix some typos

Just a minor typos fix.


Signed-off-by: bin liu <liubin0329@gmail.com>
2016-07-06 23:36:49 -07:00
k8s-merge-robot
8135154f7f Merge pull request #26868 from xiang90/rm_all
Automatic merge from submit-queue

daemon/controller.go: remove unused func enqueueAllDaemonSets
2016-07-06 23:36:45 -07:00
k8s-merge-robot
9075f53dca Merge pull request #28388 from mml/cluster-refactor
Automatic merge from submit-queue

Collect cluster state into a single type.

Mostly just makes it easier to read and, hopefully, extend.
2016-07-06 23:03:01 -07:00
k8s-merge-robot
79c8d8b735 Merge pull request #26588 from caesarxuchao/release-1.4-clientset
Automatic merge from submit-queue

[client-gen] stop update release_1_3 clientset; create release_1_4

We'll bump the version after we cut 1.3 release. I'll keep this PR assigned to myself in the mean time.

@lavalamp
2016-07-06 23:02:56 -07:00
Davanum Srinivas
e3146456d3
Change Commands to Sub-commands in help 2016-07-06 23:29:49 -04:00
Davanum Srinivas
59142694bf
Remove Extra line after Aliases 2016-07-06 23:28:11 -04:00
k8s-merge-robot
5fe54ac9ef Merge pull request #25640 from dims/fix-issue-7496
Automatic merge from submit-queue

kubectl should print usage at the bottom

Override the Usage: output using SetUsageTemplate. Just moved
the strings in the template to make sure we print Usage: at
the bottom of the output and not at the top.

Fixes issue #7496
2016-07-06 20:19:18 -07:00
Alexander Staubo
e681002d18 Fixes bad heuristic when calling "tc show" to check interface; tc sometimes returns stuff
that has more than 12 words in its response. The heuristic is bad, but this at least fixes
the case when tc is returning too much.
2016-07-06 23:18:56 -04:00