Commits · ed9a1bbd3a9b689f4953deb6308d631314edf3f4 · Jacklull / k3s

18 Sep, 2015 14 commits
- support fibre channel volume · ed9a1bbd
  Huamin Chen authored Aug 11, 2015
```
Signed-off-by: Huamin Chen <hchen@redhat.com>
```
  ed9a1bbd
- Merge pull request #13786 from socaa/hpa-test · 0f8cc892
  Marcin Wielgus authored Sep 18, 2015
```
Horizontal Pod Autoscaler is deleted along with namespace
```
  0f8cc892
- Merge pull request #13277 from uluyol/sv-detect-group · 434b7688
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  434b7688
- Merge pull request #13417 from jfoy/kubelet_tolerates_dead_cloud_api · 1a88be1a
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  1a88be1a
- Horizontal Pod Autoscaler is deleted along with namespace · d6d199dd
  Ewa Socala authored Sep 10, 2015
  
  d6d199dd
- Merge pull request #14096 from mvdan/util-duration · 73d71d6a
  k8s-merge-robot authored Sep 18, 2015
```
Auto commit by PR queue bot
```
  73d71d6a
- Merge pull request #14109 from BugRoger/replace_file_with_lsblk_command_for_volume_checks · 755ff241
  k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
  755ff241
- Merge pull request #13880 from yujuhong/fix_annotations · 9e5ed1dc
  Nikhil Jindal authored Sep 17, 2015
```
Fix source annotation in kubelet
```
  9e5ed1dc
- Merge pull request #13852 from hurf/lr_ratio_validation · 55774307
  k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
  55774307
- Correctly do swagger validation with experimental. · f855e758
  Muhammed Uluyol authored Aug 27, 2015
```
Before we tried both groups, first api then experimental. If
experimental failed, the error message would be discarded and the
message for api would be shown. This commit changes this behavior so
that we detect which api group we should be using and only show the
error for that group.
```
  f855e758
- Merge pull request #14147 from timstclair/prober-test · 94e4426c
  k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
  94e4426c
- Move pkg/util.Time to pkg/api/unversioned.Time · 586cb912
  Daniel Martí authored Sep 17, 2015
```
Along with our time.Duration wrapper, as suggested by @lavalamp.
```
  586cb912
- Merge pull request #13848 from jayunit100/kubeconfig-file-description-and-updates · 0fb60482
  k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
  0fb60482
- Move the prober test from the docker manager_test.go to prober_test.go · 1d057728
  Tim St. Clair authored Sep 17, 2015
  
  1d057728
17 Sep, 2015 26 commits

Add pkg/api/unversioned.Duration type · 21c7dd42
Daniel Martí authored Sep 16, 2015
```
Similar to pkg/util.Time.
```
21c7dd42
Merge pull request #14141 from quinton-hoole/2015-09-17-fix-daemon-e2e-regex · 7e375b9c
Alex Mohr authored Sep 17, 2015
```
Spaces don't work in e2e regex's.  Doh!
```
7e375b9c
Merge pull request #14144 from caesarxuchao/fix-e2e · 72046c43
Alex Mohr authored Sep 17, 2015
```
fix e2e
```
72046c43
fix e2e · 55b0bf0d
Chao Xu authored Sep 17, 2015

55b0bf0d
Merge pull request #13659 from linzichang/fix-ip-conflict · ef33c2fa
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
ef33c2fa
Merge pull request #14004 from mbruzek/enable-ssl-squash · 48275aa9
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
48275aa9
Spaces don't work in e2e regex's. Doh! · e1c75e91
Quinton Hoole authored Sep 17, 2015

e1c75e91
Merge pull request #13697 from ArtfulCoder/kube-proxy-tests · 5fbaa053
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
5fbaa053
Merge pull request #14137 from caesarxuchao/13823 · bdfd469a
Alex Mohr authored Sep 17, 2015
```
rebase 13823
```
bdfd469a

Update node status even if cloudprovider API dies · ab9b53bd

authored Aug 31, 2015

kubelet will log errors when the cloudprovider API is unavailable, but
will continue to persist node updates using last-known addresses.

Without this change, all nodes are marked as NotReady, and eventually
controller-manager evicts all pods.

ab9b53bd

Merge pull request #13791 from fgrzadkowski/fix_secrets_in_docker · c1eb1a1b
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
c1eb1a1b
Merge pull request #14045 from jiangyaoguo/add-message-for-reason-cache · 07493393
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
07493393
Merge pull request #14110 from derekwaynecarr/event_name_against_api_conventions · a5d39180
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
a5d39180
Merge pull request #12671 from mikeln/master · e8b53628
Alex Mohr authored Sep 17, 2015
```
Much smaller hyperkube image creation
```
e8b53628
Merge pull request #14120 from mesosphere/sttts-cleanup-hostname-override · 654dd38b
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
654dd38b
Regenerating everything · c5f22a02
Kris authored Sep 10, 2015

c5f22a02
Moving Status object to a common package · f4ad00d9
Kris authored Sep 09, 2015

f4ad00d9
Merge pull request #14123 from Huawei-PaaS/issue/missing_parameter · 9cb14776
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
9cb14776
Merge pull request #14135 from quinton-hoole/2015-09-17-demote-daemon-e2e-to-flaky · a32ea8eb
Alex Mohr authored Sep 17, 2015
```
Demote e2e test "Daemon set ... launch a pod on every node of the clu…
```
a32ea8eb

Changes necessary to enable ssl for the Juju charms · 7a387a87

authored Sep 15, 2015

Squashed commit of the following:

commit dedaccffdc1d797b5f23e0004280c2fcc0ecffa9
Merge: 24c3585 f03a2670
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.

7a387a87

Merge pull request #13259 from soltysh/job_controller_logic · 36eb7372
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
36eb7372
Added some clarity to kubeconfig around tokens and how it corresponds to · 5ca618f8
jay vyas authored Sep 10, 2015
```
the apiservers.
```
5ca618f8
Demote e2e test "Daemon set ... launch a pod on every node of the cluster" to flaky. · ceea590f
Quinton Hoole authored Sep 17, 2015

ceea590f
Merge pull request #13649 from markturansky/prov_deleter · 055f5ff9
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
055f5ff9
Merge pull request #14049 from brendandburns/apiserver2 · 3b221fb0
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
3b221fb0
Merge pull request #13778 from smarterclayton/unready_endpoints · 7cee0284
k8s-merge-robot authored Sep 17, 2015
```
Auto commit by PR queue bot
```
7cee0284