Commit Graph

3302 Commits (6d9e0ed038d1467a48ff3d8f6badccd805edd687)

Author SHA1 Message Date
k8s-merge-robot 271784e5fa Merge pull request #21167 from andyzheng0831/trusty-release
Auto commit by PR queue bot
2016-03-05 01:57:52 -08:00
k8s-merge-robot 4c09c84c75 Merge pull request #22249 from ZhangZhenhua/ubuntu-deployment-fix
Auto commit by PR queue bot
2016-03-05 01:25:41 -08:00
Cole Mickens 063cf83a72 respond to davidopp's feedback
also:
- adds a mechanism to build and upload hyperkube for non-official
  releases
- adds a mechanism for proxying azkube's traffic
- --no-cloud-provider for now
- support specifying the resource group for CI scenarios
2016-03-05 00:19:58 -08:00
Cole Mickens a9448d0d56 cluster/azure: kube-up works; validation succeeds 2016-03-05 00:17:05 -08:00
k8s-merge-robot 57c944caa2 Merge pull request #22434 from justinsb/aws_docker_babysitter
Auto commit by PR queue bot
2016-03-04 21:52:03 -08:00
Abhi Shah 506f4d2212 Merge pull request #22551 from dchen1107/test1
Enable --log-level=info for docker daemons for scalability jenkins jo…
2016-03-04 16:50:19 -08:00
k8s-merge-robot 23aa8565e2 Merge pull request #20851 from vmware/vsphere-docker-version-fix
Auto commit by PR queue bot
2016-03-04 15:50:36 -08:00
Abhi Shah 9bfd70f8f6 Merge pull request #20688 from ArtfulCoder/podhostname
Specify Pod hostname by Annotation
2016-03-04 15:17:34 -08:00
Abhi Shah c47564f00b Merge pull request #22542 from timstclair/heapster
Use the summary_api with heapster by default
2016-03-04 13:37:52 -08:00
Dawn Chen fd10ca2f45 Enable --log-level=info for docker daemons for jenkins jobs and e2e tests except soak-continuous. 2016-03-04 13:31:42 -08:00
Abhishek Shah a3c00aadd5 Specify hostname, subdomain via annotation on podspec.
The hostname is a DNS A record, if the subdomain maps to a service name
in the same namespace
2016-03-04 13:28:33 -08:00
Abhi Shah df05c5ae7d Merge pull request #22253 from bprashanth/kubedns
Wait on Kubernetes service in DNS pod
2016-03-04 12:50:05 -08:00
Andy Zheng 242b9977c7 Remove manifest copies from Trusty support
This change revises the way to provide kube-system manifests for clusters on Trusty. Originally, we maintained copies of some manifests under cluster/gce/trusty/kube-manifests, which is not scalable and hard to maintain. With this change, clusters on Trusty will use the same source of manifests as ContainerVM. This change also fixes some minor problems such as shell variables and comments to meet the style guidance better.
2016-03-04 11:16:49 -08:00
Abhi Shah 4d599ea309 Merge pull request #22261 from gmarek/kube-up
kube-up for GCE chooses master size based on number of nodes
2016-03-04 10:55:12 -08:00
Abhi Shah f9c4b3db1e Merge pull request #22493 from andyzheng0831/enhance
Fix a breakage of kubelet in Trusty
2016-03-04 10:50:03 -08:00
Abhi Shah bfe4896b00 Merge pull request #22043 from roberthbailey/cluster-name
Add the GCE cluster name to instance metadata
2016-03-04 10:43:39 -08:00
Abhi Shah 05ba8ca7fa Merge pull request #22170 from metmajer/master
Pass through EXTRA_DOCKER_OPTS.
2016-03-04 10:40:17 -08:00
Tim St. Clair 1d90394bf6 Use the summary_api with heapster by default 2016-03-04 10:37:00 -08:00
Abhi Shah a20258efae Merge pull request #22492 from vishh/heapster-update
Update heapster to v0.20.0.alpha11
2016-03-04 09:27:01 -08:00
Justin Santa Barbara 6bdab05d11 Salt: Don't use Salt to start Docker
Starting docker through Salt has always been problematic.  Kubelet or
the babysitter process should start it.  We've kept it around primarily
so we have a `service: docker` node for the Salt DAG.

Instead, we enable (but do not start) the Docker service in Salt.  This
lets us keep the DAG node, but won't start it.

There's another bug in Salt, where watches will start the service even
on `service.enabled`.  So we remove the watches, and move them to our
existing Salt bug-fix script.
2016-03-04 12:07:10 -05:00
Justin Santa Barbara dbff0ef67b Systemd/non-Redhat: Add docker healthcheck script
We do the equivalent of #21727 for systemd systems.

Issue #21731
2016-03-04 12:05:52 -05:00
Justin Santa Barbara 64f1cbaddd Systemd/non-Redhat: Add docker prestart file
We do the equivalent of #21727 for systemd systems.

Issue #21731
2016-03-04 12:05:52 -05:00
Justin Santa Barbara d074b5ba13 docker systemd file: type->notify, docs->https
This minimizes the changes we make to the official Docker systemd file.
2016-03-04 12:05:52 -05:00
Alex Robinson 29eb6020fb Merge pull request #22074 from a-robinson/images
Update the logging images to parse sub-second docker timestamps.
2016-03-04 09:04:33 -08:00
k8s-merge-robot 49f438bfac Merge pull request #21972 from olivierlemasle/fix-21746
Auto commit by PR queue bot
2016-03-04 06:00:18 -08:00
k8s-merge-robot 09313b0847 Merge pull request #22254 from vmware/vsphere-pod-cidr-fix
Auto commit by PR queue bot
2016-03-04 04:17:44 -08:00
k8s-merge-robot 6d690d3f8a Merge pull request #21904 from justinsb/salt_docker_install_fix
Auto commit by PR queue bot
2016-03-03 22:07:14 -08:00
Jeff Lowdermilk 93e14a63e8 Revert "Enable --log-level=info for docker daemons for scalability jenkins jo…" 2016-03-03 19:21:11 -08:00
Andy Zheng e077ebf874 Fix a breakage of kubelet in Trusty
The kubelet flag "nosystem" was removed recently, which breaks kubelet in Trusty. This changes remove the flag usage accordingly. It also revises several aspects of Trusty support to make it in the same page as running on ContainerVM, such as new flags in kubelet and new logic in api-server and etcd pods.
2016-03-03 17:19:00 -08:00
Vishnu kannan 60fadb3fe5 Update heapster to v0.20.0.alpha11
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-03-03 16:50:09 -08:00
Jeff Lowdermilk 7215860ecd Merge pull request #22453 from dchen1107/test1
Enable --log-level=info for docker daemons for scalability jenkins jo…
2016-03-03 16:29:34 -08:00
Prashanth Balasubramanian 8de2fbfa0a Kube2sky synchronously waits for the Kubernetes service. 2016-03-03 15:49:46 -08:00
Jeff Lowdermilk 5fd2de1d1e Merge pull request #22394 from zmerlynn/display_licenses
Show LICENSES in /etc/motd
2016-03-03 15:20:24 -08:00
Robert Bailey 30b78e4d7f Add the GCE cluster name to instance metadata. 2016-03-03 13:57:31 -08:00
Jeff Lowdermilk 73479d5209 Merge pull request #22441 from thockin/flake-22244-gce-static-ip
Check static IP postcondition if op fails
2016-03-03 11:38:50 -08:00
Dawn Chen 84689a7a69 Enable --log-level=info for docker daemons for scalability jenkins job and e2e test. 2016-03-03 11:11:56 -08:00
Alex Robinson feea376b5c Update the logging images to parse sub-second docker timestamps. 2016-03-03 10:21:30 -08:00
Tim Hockin 6dca871693 Check static IP postcondition if op fails 2016-03-03 08:20:12 -08:00
Justin Santa Barbara 4ce0f8ccec Salt: bypass Salt when installing docker package on debian
The Docker 1.9.1 package on Debian is broken, and the service fails to
install when run unattended.  This is treated as an installation failure
and causes everything to fail.

However, the service can be started by Salt once we're not installing
the package, and indeed we restart docker anyway.

So, on Debian, use a helper script to install the docker package.  The
script sets up a policy-rc.d file to prevent the service starting, and
then cleanly removes it afterwards (this would be difficult to do in
Salt, I believe).
2016-03-03 11:14:33 -05:00
k8s-merge-robot 2cf3c7809e Merge pull request #21471 from justinsb/kube_up_auto_upgrade
Auto commit by PR queue bot
2016-03-02 21:00:43 -08:00
k8s-merge-robot d81d823ca5 Merge pull request #22393 from eparis/blunderbuss
Auto commit by PR queue bot
2016-03-02 18:51:56 -08:00
Eric Paris 5e5a823294 Move blunderbuss assignees into tree 2016-03-02 20:46:32 -05:00
Jeff Lowdermilk 5214ae1c89 Merge pull request #22313 from andyzheng0831/fix
Fix a breakage of kube-proxy in Trusty
2016-03-02 16:19:02 -08:00
Zach Loafman 820842036b Show LICENSES in /etc/motd
Plumb through from the server tarball to
/usr/local/share/docs/kubernetes/LICENSES, then display in the motd.
2016-03-02 15:23:17 -08:00
Dhawal Yogesh Bhanushali fe7568d099 cidr-fix for vsphere cloud provider
let kubelet configure cbr0 bridge.
let kube-controll-manager distributed the subnet across the nodes.
create routes for the pod network.
2016-03-02 12:52:56 -08:00
k8s-merge-robot 2cf91576a1 Merge pull request #22274 from piosz/bump-heapster
Auto commit by PR queue bot
2016-03-02 11:23:30 -08:00
k8s-merge-robot 940e0a9b94 Merge pull request #22360 from justinsb/pass_hash_to_download_or_bust
Auto commit by PR queue bot
2016-03-02 10:47:48 -08:00
k8s-merge-robot a6e534ff6a Merge pull request #21745 from bryk/release-beta1
Auto commit by PR queue bot
2016-03-02 08:33:56 -08:00
Justin Santa Barbara b058c6b3e1 AWS: Add sha to download-or-bust
download-or-bust was changed on the GCE side to verify a hash if passed,
so we need to pass a hash in the AWS scripts that reuse this function.
2016-03-02 10:12:39 -05:00
Piotr Szczesniak 80269abfd0 Bumped Heapster to v0.20.0-alpha10 2016-03-02 15:51:27 +01:00