Commit Graph

2284 Commits

Author SHA1 Message Date
Vishnu kannan
989aaef94f Upgraded heapster to v0.18.1, influxDB to v0.8.9, and Grafana to v2.0. 2015-09-21 15:42:24 -07:00
Piotr Szczesniak
9a1ec3dfb5 Added GCM support for Initial Resources plugin 2015-09-21 09:01:54 +02:00
k8s-merge-robot
83192aac45 Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy
Auto commit by PR queue bot
2015-09-19 00:15:54 -07:00
Nikhil Jindal
8754eea749 Merge pull request #14160 from zhengguoyong/minions
change minions to nodes
2015-09-18 17:37:33 -07:00
k8s-merge-robot
cad5f03311 Merge pull request #14185 from tmrts/formatting
Auto commit by PR queue bot
2015-09-18 15:16:00 -07:00
Tamer Tas
cb5f921df1 Add newline to the end of bash scripts 2015-09-18 19:35:05 +03:00
eulerzgy
9d14d1115f change minions to nodes 2015-09-19 00:01:49 +08:00
k8s-merge-robot
1a46238bf2 Merge pull request #13962 from ZJU-SEL/enhance-deploy-ubuntu
Auto commit by PR queue bot
2015-09-18 08:40:30 -07:00
liguangbo
c907bac6c8 Fix easy-rsa download time out in ubuntu deployment script 2015-09-18 17:37:04 +08:00
Dr. Stefan Schimanski
df997e2bb9 Add support for NUM_MINION to mesos/docker cluster 2015-09-18 11:34:27 +02:00
He Simei
b1907f5b1e export KUBE_VERSION 2015-09-18 14:14:20 +08:00
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
Alex Mohr
e8b53628a5 Merge pull request #12671 from mikeln/master
Much smaller hyperkube image creation
2015-09-17 14:24:19 -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
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
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
e3ecb748b9 Merge pull request #14005 from technosophos/master
Auto commit by PR queue bot
2015-09-17 01:08:08 -07:00
k8s-merge-robot
445fde3dc5 Merge pull request #13447 from pweil-/pid-mode
Auto commit by PR queue bot
2015-09-16 23:34:35 -07:00
Alex Mohr
943d7160d5 Merge pull request #14033 from gosharplite/patch-8
nslookup in different namespace
2015-09-16 14:31:22 -07:00
k8s-merge-robot
3dcb75c599 Merge pull request #13986 from derekwaynecarr/move_to_flannel
Auto commit by PR queue bot
2015-09-16 09:36:09 -07:00
k8s-merge-robot
14ccba8924 Merge pull request #13886 from a-robinson/logtags
Auto commit by PR queue bot
2015-09-16 05:51:32 -07:00
k8s-merge-robot
8385c148ba Merge pull request #13936 from andyzheng0831/trusty
Auto commit by PR queue bot
2015-09-16 05:29:18 -07:00
Tony Hsu
bab127e094 nslookup in different namespace
Since skydns is created in namespace 'kube-system' and kubernetes service is created in namespace 'default', if busybox is created in namespace 'kube-system' then nslookup will work with 'kubernetes.default'.
2015-09-16 17:44:02 +08:00
k8s-merge-robot
d5b33614c3 Merge pull request #14001 from kubernetes/revert-13866-test-grace-period
Auto commit by PR queue bot
2015-09-15 20:21:45 -07:00
derekwaynecarr
b59441f8c4 Add Fedora Cockpit to vagrant setup to administer/introspect kubernetes 2015-09-15 21:28:41 -04:00
Jeff Lowdermilk
a1294e6401 Merge pull request #13762 from runningwild/PR
More fixes to rkt support
2015-09-15 17:34:06 -07:00
Alex Robinson
8040f75594 Update fluentd-gcp to use a new google-fluentd build with my recent
changes to fluent-plugin-google-cloud to attach Kubernetes metadata to
logs.

Along with this, separate logs from containers in the cluster out from
logs from the daemons running on the node by instantiating two instances
of the output plugin, one which uses the new metadata (for containers)
and one which doesn't (for things like docker and the kubelet).
2015-09-15 23:14:43 +00:00
Matt Butcher
ac51f7e586 Allow DOCKER_OPTS to be overriden for Vagrant 2015-09-15 16:21:55 -06:00
Andy Zheng
7427387938 Add trusty node health monitoring
Upstart monitors the process of docker, kubelet, and kube-proxy.
This change adds an upstart job running as daemon to conduct
non-PID health monitoring.
2015-09-15 15:09:45 -07:00
Marek Grabowski
cda68cbeb5 Revert "Lower the grace period for Pod eviction for e2e clusters" 2015-09-15 17:55:37 -04:00
derekwaynecarr
360e7620d3 Move vagrant to flannel 2015-09-15 15:42:38 -04:00
Paul Weil
ed80c2b940 pid mode 2015-09-15 13:51:44 -04:00
He Simei
873eb3292f enhance deployment for ubuntu 2015-09-15 17:17:27 +08:00
k8s-merge-robot
c9dd648a88 Merge pull request #13900 from ZJU-SEL/kube-push-with-local-binary
Auto commit by PR queue bot
2015-09-14 11:34:10 -07:00
Dr. Stefan Schimanski
d1f558757c Only km is needed in mesos-docker km container 2015-09-14 09:56:23 +02:00
He Simei
ebeaf70658 support kube-up using local binaries for ubuntu 2015-09-14 10:49:55 +08:00
k8s-merge-robot
c8f9219272 Merge pull request #13866 from gmarek/test-grace-period
Auto commit by PR queue bot
2015-09-12 23:15:38 -07:00
Mike Danese
f27582a0b0 Merge pull request #13733 from ZJU-SEL/fix-kube-push-ubuntu
fix kube-push for ubuntu
2015-09-11 18:34:28 -07:00
Alex Robinson
f691dca96e Don't install unused configs in the fluentd-gcp Dockerfile. 2015-09-11 16:52:52 -07:00
Alex Robinson
614b1cf3c1 Replace /varlog with /var/log in the fluentd-gcp config to match the
recently updated fluent-es config.
2015-09-11 16:52:49 -07:00
k8s-merge-robot
a4932454ac Merge pull request #13803 from justinsb/aws_aufs_one_volume
Auto commit by PR queue bot
2015-09-11 14:00:52 -07:00
k8s-merge-robot
5add5d6f96 Merge pull request #13863 from jlowdermilk/gke-jenkins-config
Auto commit by PR queue bot
2015-09-11 12:05:55 -07:00
Mike Danese
4bd638921f Merge pull request #13752 from yujuhong/docker1.8_upgrade
Upgrade to docker 1.8.2 for Debian Wheezy on GCE
2015-09-11 11:15:30 -07:00
Jeff Lowdermilk
7229096453 Add config for the main gke-jenkins jobs to e2e.sh 2015-09-11 11:05:30 -07:00
gmarek
645c9153d4 Lower the grace period for Pod eviction for e2e clusters 2015-09-11 13:55:15 -04:00
Yu-Ju Hong
4cdd00fb9c Upgrade to docker 1.8.2 for Debian Wheezy on GCE 2015-09-11 10:09:59 -07:00
Jerzy Szczepkowski
5be8817315 Turning on pod autoscaler on GCE.
Implemented optional turning on of pod autoscaler in kube-up script for GCE.
2015-09-11 12:03:41 +02:00
k8s-merge-robot
8491a6028b Merge pull request #13843 from thockin/dns-docs-cleanup
Auto commit by PR queue bot
2015-09-10 23:03:39 -07:00
Tim Hockin
248881d44f Update DNS docs to cover --resolv-conf 2015-09-10 22:12:28 -07:00