Commit Graph

17789 Commits

Author SHA1 Message Date
k8s-merge-robot
ef33c2faa4 Merge pull request #13659 from linzichang/fix-ip-conflict
Auto commit by PR queue bot
2015-09-17 16:03:39 -07:00
k8s-merge-robot
48275aa944 Merge pull request #14004 from mbruzek/enable-ssl-squash
Auto commit by PR queue bot
2015-09-17 16:00:09 -07:00
k8s-merge-robot
5fbaa05362 Merge pull request #13697 from ArtfulCoder/kube-proxy-tests
Auto commit by PR queue bot
2015-09-17 15:29:44 -07:00
Alex Mohr
bdfd469a85 Merge pull request #14137 from caesarxuchao/13823
rebase 13823
2015-09-17 15:25:52 -07:00
k8s-merge-robot
c1eb1a1b2f Merge pull request #13791 from fgrzadkowski/fix_secrets_in_docker
Auto commit by PR queue bot
2015-09-17 15:13:29 -07:00
k8s-merge-robot
0749339357 Merge pull request #14045 from jiangyaoguo/add-message-for-reason-cache
Auto commit by PR queue bot
2015-09-17 14:54:47 -07:00
k8s-merge-robot
a5d3918082 Merge pull request #14110 from derekwaynecarr/event_name_against_api_conventions
Auto commit by PR queue bot
2015-09-17 14:40:31 -07:00
Alex Mohr
e8b53628a5 Merge pull request #12671 from mikeln/master
Much smaller hyperkube image creation
2015-09-17 14:24:19 -07:00
k8s-merge-robot
654dd38b1c Merge pull request #14120 from mesosphere/sttts-cleanup-hostname-override
Auto commit by PR queue bot
2015-09-17 14:23:36 -07:00
Kris
c5f22a025a Regenerating everything 2015-09-17 14:09:53 -07:00
Kris
f4ad00d9ae Moving Status object to a common package 2015-09-17 14:09:53 -07:00
k8s-merge-robot
9cb1477662 Merge pull request #14123 from Huawei-PaaS/issue/missing_parameter
Auto commit by PR queue bot
2015-09-17 14:08:53 -07:00
Alex Mohr
a32ea8ebc1 Merge pull request #14135 from quinton-hoole/2015-09-17-demote-daemon-e2e-to-flaky
Demote e2e test "Daemon set ... launch a pod on every node of the clu…
2015-09-17 13:51:24 -07:00
Matt Bruzek
7a387a87a1 Changes necessary to enable ssl for the Juju charms
Squashed commit of the following:

commit dedaccffdc1d797b5f23e0004280c2fcc0ecffa9
Merge: 24c3585 f03a267
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Tue Sep 15 17:07:42 2015 -0500

    Merge branch 'master' of github.com:kubernetes/kubernetes into enable-ssl

commit 24c358566cc0963fb86dc057db15739f031ba6f6
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Tue Sep 15 16:44:58 2015 -0500

    Fixing problems with verify-boilerplate.

commit a64443352c64498255ac98fc0da1a7d8d5934485
Merge: f152794 ee3f662
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Tue Sep 15 15:43:08 2015 -0500

    Merge branch 'enable-ssl' of github.com:mbruzek/kubernetes into enable-ssl

    Conflicts:
    	cluster/juju/util.sh

commit f152794502c017ae7d3cff0351d8bf44b7311883
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 14:12:21 2015 -0500

    Fixes for problems found in testing.

commit 94effa4827d5f30c60621e9133c4526c187e40b4
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 12:34:37 2015 -0500

    Making updates for changes in master branch.

commit a81795b44e57d54b8b4ae486ca6ea8164ac8fc6b
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:39:36 2015 -0500

    pep8 fix

commit 53a862caea02c4b35f8cd19b1549fda29e040f12
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:37:31 2015 -0500

    Adding diagnostic log messages and reloading nginx.

commit 96411a924fb05e2e58534cce94d9a1e51d7db9af
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:19:31 2015 -0500

    Making the check user logic cleaner.

commit a0243b34cdda2f865e559bd4812c5a78ab6f6f05
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:18:04 2015 -0500

    Open port 6443 for ssl enablement.

commit e8423614763aa6d650089c735c3dc1893bf73993
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:16:54 2015 -0500

    Generating certificates and adding config options.

commit 6570a818e252f2cb156a577094ba987dec834fe1
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:14:56 2015 -0500

    Removing the http configuration adding https config.

commit e624bd79f8840b71b141a111bca7c6091b677575
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:13:04 2015 -0500

    Changed the distribution nginx config slightly.

commit c497911170268ee75bed53afeb5fa32ff44c82af
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:57:17 2015 -0500

    Adding the crt and key to the apiserver flags.

commit 6c1e76c5de31eb4d0f800065ce4bc96a82801846
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:56:15 2015 -0500

    Adding the cert and key configuration parameters.

commit 55da910d473efa0be0af5efccf2336612525986e
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:49:46 2015 -0500

    Adding a requirements file to install path.py with pip -r

commit 27a39686af89e134268be50ce5e4fc36cffdf2b3
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Fri Aug 21 16:34:56 2015 -0500

    Making the install hook idempotent.

commit ee3f66287ba045592f932c3a41aeb8e0167a9235
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 14:12:21 2015 -0500

    Fixes for problems found in testing.

commit 3dfdbb0e21d79da66617f7a29e6dd8d977528057
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 12:34:37 2015 -0500

    Making updates for changes in master branch.

commit df9c297fe27c63713fc0d7dbd461b2d47133614c
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:39:36 2015 -0500

    pep8 fix

commit 645b25d9cc84555ca7af5c75e3f0b1300aaa9f48
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:37:31 2015 -0500

    Adding diagnostic log messages and reloading nginx.

commit 57654320bd73dc4dd52d6d56021d40a97c6ed893
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:37:02 2015 -0500

    Removing xtrace.

commit a0e8cd98353e7cd411786bc8836fe99a77cde3ba
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:19:31 2015 -0500

    Making the check user logic cleaner.

commit 6c6eb7ff02d6dbf66d3175b715e957b00a861525
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:18:04 2015 -0500

    Open port 6443 for ssl enablement.

commit 29f18cc95ff96de1a48f72af2cff2e37420a43c7
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:16:54 2015 -0500

    Generating certificates and adding config options.

commit c9bdaa499552980153ff263a1ab9b4fa73a0536a
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:14:56 2015 -0500

    Removing the http configuration adding https config.

commit ec33e66a159a4b44207353b16741c7fad2e4ee0d
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:13:04 2015 -0500

    Changed the distribution nginx config slightly.

commit 96dc16879c0dd230569ceb928f9f7bf92ff8ab3f
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:57:17 2015 -0500

    Adding the crt and key to the apiserver flags.

commit 308799502c0a22f214408395f5efa4821d075374
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:56:15 2015 -0500

    Adding the cert and key configuration parameters.

commit 7f407a4356de8703ff2f237432084f35910d8abd
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:49:46 2015 -0500

    Adding a requirements file to install path.py with pip -r

commit f800ae1152076758d4db203fdbecf6d945c0e892
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Fri Aug 21 16:34:56 2015 -0500

    Making the install hook idempotent.

Resolving verification problems.
2015-09-17 15:23:02 -05:00
k8s-merge-robot
36eb7372c8 Merge pull request #13259 from soltysh/job_controller_logic
Auto commit by PR queue bot
2015-09-17 13:22:34 -07:00
Quinton Hoole
ceea590f7e Demote e2e test "Daemon set ... launch a pod on every node of the cluster" to flaky. 2015-09-17 13:11:51 -07:00
k8s-merge-robot
055f5ff9b9 Merge pull request #13649 from markturansky/prov_deleter
Auto commit by PR queue bot
2015-09-17 12:59:45 -07:00
k8s-merge-robot
3b221fb074 Merge pull request #14049 from brendandburns/apiserver2
Auto commit by PR queue bot
2015-09-17 12:32:26 -07:00
k8s-merge-robot
7cee028497 Merge pull request #13778 from smarterclayton/unready_endpoints
Auto commit by PR queue bot
2015-09-17 11:36:17 -07:00
k8s-merge-robot
7f68b9bc80 Merge pull request #14090 from yujuhong/node_status
Auto commit by PR queue bot
2015-09-17 11:14:11 -07:00
Alex Mohr
f893245f4e Merge pull request #14103 from feihujiang/fixWrongPathOfDocument
Fixes the wrong path of documents
2015-09-17 10:27:41 -07:00
Alex Mohr
959c1a14cf Merge pull request #13750 from jimmycuadra/docs-accessing-the-api
Clarify authentication methods for k8s components
2015-09-17 10:26:58 -07:00
k8s-merge-robot
ea410b389c Merge pull request #14063 from deads2k/enable-system-ca
Auto commit by PR queue bot
2015-09-17 10:23:26 -07:00
jiangyaoguo
0d1ca62530 Add message to reason cache in kubelet 2015-09-18 01:19:04 +08:00
Jian Huang
1e9b8de56c Fix the issue where output paramters not matched golog string format 2015-09-18 00:45:01 +08:00
Dr. Stefan Schimanski
88466dd21e Cleanup --hostname-override logic in procurment 2015-09-17 18:41:16 +02:00
k8s-merge-robot
62d8cfb615 Merge pull request #13765 from brendandburns/schema-api-5
Auto commit by PR queue bot
2015-09-17 09:32:04 -07:00
markturansky
c2de9e9647 Added volume.Deleter interface and simple HostPath implementation 2015-09-17 12:08:58 -04:00
k8s-merge-robot
37c4e2eba3 Merge pull request #13808 from derekwaynecarr/add_cockpit
Auto commit by PR queue bot
2015-09-17 08:36:34 -07:00
k8s-merge-robot
308155d178 Merge pull request #14038 from Huawei-PaaS/fixed_some_typos_in_sharing_clusters_md
Auto commit by PR queue bot
2015-09-17 08:14:42 -07:00
Eric Paris
650e38e12b Merge pull request #14083 from eparis/fix-doc-gen-on-mac
Fix doc generation on Macs
2015-09-17 09:56:13 -05:00
k8s-merge-robot
8071a73c6b Merge pull request #14100 from socaa/rc-limit
Auto commit by PR queue bot
2015-09-17 07:44:28 -07:00
Filip Grzadkowski
7fe34f2050 Introduce nsenter writer for volume plugins 2015-09-17 16:40:29 +02:00
deads2k
a093ea34c3 enable system cas 2015-09-17 10:31:30 -04:00
derekwaynecarr
1acc203b36 Node controller produces events with invalid names 2015-09-17 09:59:48 -04:00
k8s-merge-robot
e8f77b3673 Merge pull request #14067 from deads2k/add-sa-token-resolver
Auto commit by PR queue bot
2015-09-17 06:51:00 -07:00
Clayton Coleman
bf2decce81 Add NotReadyAddresses to Endpoints
In many cases clients may wish to view not ready addresses for endpoints
in order to do set membership prior to a pod being ready. For instance,
a pod that uses the service endpoints to connect to other pods under
the same service, but does not want to signal ready before it has
contacted at least a minimal number of other pods.

This is backwards compatible with old servers and clients. There is
an additional cost in size of endpoints before services ramp up, which
will add minor CPU and memory use for services that have a significant
number of pods which have not become ready.
2015-09-17 09:41:56 -04:00
Ewa Socala
997186d10c CPU & Memory Limit added to RCConfig in autoscaling_utils.go 2015-09-17 15:19:21 +02:00
feihujiang
51f59f3c78 Fix the wrong path of document 2015-09-17 20:38:08 +08:00
Piotr Szczesniak
81d3bd9a36 Merge pull request #14034 from jszczepkowski/hpa-unittest
Unittests for horizontal pod autoscaler controller.
2015-09-17 13:53:29 +02:00
deads2k
32a495acb6 add helper methods for SA token secret checks 2015-09-17 07:50:09 -04:00
k8s-merge-robot
e83bf49f86 Merge pull request #13957 from ghodss/rename-deployment-structs
Auto commit by PR queue bot
2015-09-17 04:23:13 -07:00
k8s-merge-robot
b342591032 Merge pull request #13604 from JanetKuo/kubectl-edit
Auto commit by PR queue bot
2015-09-17 03:00:33 -07:00
k8s-merge-robot
e18c9639b5 Merge pull request #13908 from mesosphere/speedup-mesos-docker-build
Auto commit by PR queue bot
2015-09-17 02:36:43 -07:00
k8s-merge-robot
a204f31516 Merge pull request #13918 from mesosphere/reconcile-ignore-mirror-pods
Auto commit by PR queue bot
2015-09-17 02:36:31 -07:00
k8s-merge-robot
367e5571bf Merge pull request #13965 from mesosphere/healthz
Auto commit by PR queue bot
2015-09-17 02:13:31 -07:00
k8s-merge-robot
2e255b5fcd Merge pull request #13977 from JanetKuo/kubectl-scale-rc-pd
Auto commit by PR queue bot
2015-09-17 01:52:33 -07:00
k8s-merge-robot
bf990acefa Merge pull request #13988 from thockin/kube-proxy-startup-clobber
Auto commit by PR queue bot
2015-09-17 01:29:35 -07:00
k8s-merge-robot
e3ecb748b9 Merge pull request #14005 from technosophos/master
Auto commit by PR queue bot
2015-09-17 01:08:08 -07:00
Maciej Szulik
8cefa2ee55 Job controller logic 2015-09-17 10:05:33 +02:00