Commit Graph

3477 Commits

Author SHA1 Message Date
k8s-merge-robot
78dc9c7716 Merge pull request #19376 from luxas/dns_cross_platform
Automatic merge from submit-queue

Make kube2sky and skydns docker images cross-platform

ARM tracking issue: #17981
Continues on: #19216

Make it possible to create `kube2sky` and `skydns` docker images for ARM and other architectures too
Build in a container, so `golang` isn't a dependency
I've preserved the original default behaviour:
 - `skydns`: It just compiles with go on host
 - `kube2sky`: Build an image

@brendandburns @dchen1107 @ArtfulCoder @thockin @fgrzadkowski
2016-04-11 05:47:10 -07:00
Lucas Käldström
1c8140c2ac Make kube2sky and skydns docker images cross-platform: amd64, arm, arm64 and ppc64le 2016-04-11 07:31:59 +03:00
Jeff Lowdermilk
347158e520 Merge pull request #23680 from rosskukulinski/master
Add KUBERNETES_RELEASE option to get-kube.sh
2016-04-08 20:53:47 -07:00
Jeff Lowdermilk
e17213a2a8 Merge pull request #23491 from onorua/master
set KillMode for kubelet to process, fix for #13511
2016-04-08 16:39:32 -07:00
Jeff Lowdermilk
7720a16bcf Merge pull request #23893 from mbhinder/kubernetes
Fixed typo: kuberntes -> kubernetes
2016-04-08 12:47:36 -07:00
Jeff Lowdermilk
d8f42f848d Merge pull request #23996 from andyzheng0831/fix
Trusty: Do not create the docker-daemon cgroup
2016-04-08 12:45:16 -07:00
Jeff Lowdermilk
601262af0d Merge pull request #24058 from jlowdermilk/fix-list-resources
Fix list-resources grep
2016-04-08 12:41:40 -07:00
Jeff Lowdermilk
650d99fbd9 Fix list-resources grep 2016-04-08 12:19:24 -07:00
Jeff Lowdermilk
ca5b764210 Merge pull request #23876 from mikedanese/stop-to-delete
use kubectl delete in kube-addon-manager instead of stop
2016-04-08 09:30:56 -07:00
Andy Zheng
b1e18f3ca0 Trusty: Do not create the docker-daemon cgroup 2016-04-07 13:43:26 -07:00
Minhan Xia
f690220b5c Merge pull request #23704 from freehan/kubenet
Update cni binary

#23712 is depending on this. Not sure why this one gets in first. Hand merging this
2016-04-06 15:47:42 -07:00
Preet Bhinder
d178d78013 Fixed typo: kuberntes -> kubernetes
"Kubernetes" was misspelled in a couple of places.
2016-04-05 16:20:08 -07:00
k8s-merge-robot
4f329516ae Merge pull request #22149 from luxas/onedotsix
Automatic merge from submit-queue

Up to golang 1.6

A second attempt to upgrade go version above `go1.4`
Merge ASAP after you've cut the `release-1.2` branch and feel ready.
`go1.6` should perform slightly better than `go1.5`, so this time it might work
@gmarek @wojtek-t @zmerlynn @mikedanese @brendandburns @ixdy @thockin
2016-04-05 13:26:18 -07:00
Mike Danese
7b8dbf4876 use kubectl delete in kube-addon-manager instead of stop
stop has been deprecated for about a year
2016-04-05 09:31:45 -07:00
k8s-merge-robot
b8d000853e Merge pull request #21617 from luxas/hyperkube_for_arm
Automatic merge from submit-queue

Cross-build hyperkube and debian-iptables for ARM. Also add a flannel image

We have to be able to build complex docker images too on `amd64` hosts.
Right now we can't build Dockerfiles with `RUN` commands when building for other architectures e.g. ARM.

Resin has a tutorial about this here: https://resin.io/blog/building-arm-containers-on-any-x86-machine-even-dockerhub/
But it's a bit clumsy syntax.

The other alternative would be running this command in a Makefile:
```
# This registers in the kernel that ARM binaries should be run by /usr/bin/qemu-{ARCH}-static
docker run --rm --privileged multiarch/qemu-user-static:register --reset
```
and 
```
ADD https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-arm-static.tar.xz /usr/bin
```
Then the kernel will be able to differ ARM binaries from amd64. When it finds a ARM binary, it will invoke `/usr/bin/qemu-arm-static` first and lets `qemu` translate the ARM syscalls to amd64 ones.
Some code here: https://github.com/multiarch

WDYT is the best approach? If registering `binfmt_misc` in the kernels of the machines is OK, then I think we should go with that.
Otherwise, we'll have to wait for resin's patch to be merged into mainline qemu before we may use the code I have here now.

@fgrzadkowski @david-mcmahon @brendandburns @zmerlynn @ixdy @ihmccreery @thockin
2016-04-04 22:03:32 -07:00
k8s-merge-robot
ce988c8d75 Merge pull request #23817 from matjohn2/pr_cni_vagrant
Automatic merge from submit-queue

support NETWORK_PROVIDER=cni for KUBERNETES_PROVIDER=vagrant

While trying to develop CNI plugins for K8's, I found the docs referenced the support of --network-plugin=cni for kubelet, but this wasn't surfaced up via salt to support env NETWORK_PROVIDER=cni before a kube-up deployment.

This PR is my attempt at adding CNI support to the kube-up happy path, following a lot of similar work for NETWORK_PROVIDER=kubenet which already exists.

Also, I've added the ability to consume CNI plugin's (binaries) and configuration files from the local cluster/network-plugins directory into the necessary locations as referenced here for CNI:
http://kubernetes.io/docs/admin/network-plugins 
This allows a local developer to easily work on CNI plugin development while following the existing kube-up.sh docs and process.

In general, i've struggled to find any authoritative information or answers to my questions in slack regarding CNI progress / correct integration, so comments encouraged here!
2016-04-04 14:30:22 -07:00
k8s-merge-robot
6173c43c80 Merge pull request #23724 from maciaszczykm/dashboard-release-v1.0.1
Automatic merge from submit-queue

Update Dashboard UI addon to v1.0.1

Release details:
https://github.com/kubernetes/dashboard/releases/tag/v1.0.1

CC @bryk
2016-04-04 14:30:20 -07:00
Lucas Käldström
560268e036 Add a flannel image for arm and amd64. Cross-build debian-iptables for arm, arm64 and ppc64le. Build and push hyperkube for arm on every release 2016-04-04 23:33:32 +03:00
Matt Johnson
ce220836c3 Allow for local CNI binaries and configuration files with KUBERNETES_PROVIDER=vagrant.
Files are taken from cluster/network-plugins/{bin,conf} to be consumed within a vagrant kube-up.sh environment.
Paths used for configuration files and the 'cni' name of the network provider are all from the kubernetes documentation, but the actual implementation in the salt automation doesn't seem to exist.
2016-04-04 14:38:00 +01:00
Matt Johnson
46e6df655f Support use of NETWORK_PROVIDER=cni with KUBERNETES_PROVIDER=vagrant for a kube-up.
Use of NETWORK_PROVIDER=cni is documented as useable (as well as it's affects on the runtime args of kubelet),
however the actual implimentation in the salt automation doesnt seem to exist.
this change attempts to fix that for the vagrant usecase.
2016-04-04 14:37:48 +01:00
Marcin Maciaszczyk
7250028484 Update Dashboard UI addon to v1.0.1
Release details:
https://github.com/kubernetes/dashboard/releases/tag/v1.0.1
2016-04-04 09:13:31 +02:00
k8s-merge-robot
5be819b607 Merge pull request #23612 from mikedanese/addon-fix
Automatic merge from submit-queue

use apply instead of create to setup namespaces and tokens in addon manager

when the addon manager restarts, it takes ~15 minutes (1000 seconds) to start the sync loop because it retries creation of namespace and tokens 100 times. Create fails if the tokens already exist. Just use apply.
2016-04-03 05:50:12 -07:00
k8s-merge-robot
47bcf37198 Merge pull request #23045 from justinsb/aws_bump_image_20160316
Automatic merge from submit-queue

AWS kube-up: Bump jessie image
2016-04-03 03:47:34 -07:00
k8s-merge-robot
b448825211 Merge pull request #23603 from mikedanese/dont-create-secret-for-dns
Automatic merge from submit-queue

stop creating secrets for dns, it uses the kube-system service account now
2016-04-02 17:20:52 -07:00
k8s-merge-robot
372c1647b8 Merge pull request #23440 from mbruzek/juju-kube-up
Automatic merge from submit-queue

Juju kube up

I found some problems with the kube-up script that this pull request addresses. We didn't have the kubectl binary in the correct location. 

Just changing where we download the package from the master, and fixing the kube-down.sh script to remove those files.
2016-04-02 08:19:26 -07:00
Justin Santa Barbara
f43f398cad AWS kube-up: Allow BLOCK_DEVICE_MAPPINGS_BASE to be empty
We rename it to EPHEMERAL_BLOCK_DEVICE_MAPPINGS, and we also change the value
so that it starts with a `,`, instead of always inserting a comma before it.
In this way the value can be empty.

Also, if the user sets the (currently experimental) KUBE_AWS_STORAGE
environment variable to be "ebs", then we will not mount any instance storage
which will cause the machines to use EBS storage instead.
2016-04-01 22:27:28 -04:00
Justin Santa Barbara
1c3f706383 AWS: Don't error if there are no ephemeral disks
format-disks used to run with non-strict bash semantics, but this changed in
1.2 as we now merge it into the GCE script, so pipefail and errexit are both
set.

However, the way we list the ephemeral disks, by piping to grep, would cause an
exit code of 2 if there were no ephemeral disks.

Tolerate failure here by add `|| true`.  The metadata service call is unlikely
to fail, so we continue to ignore that possibility.
2016-04-01 22:27:20 -04:00
k8s-merge-robot
1521aa8a86 Merge pull request #23550 from luxas/fix_hyperkube_certs
Automatic merge from submit-queue

Fix so setup-files don't recreate/invalidate certificates that already exist

Fixes: #23197 and a lot of other DNS and dashboard issues

This is quite critical for `docker`-based users and should be considered as a **cherrypick-candidate** as it makes a lot of people wonder why Dashboard and/or DNS doesn't work. Example: https://github.com/kubernetes/dashboard/issues/374

Earlier when you shut your `docker.md` cluster down and started it again, all ServiceAccounts became invalidated by `setup-files` that happily ran once again and replaced all files. That made `apiserver` and `controller-manager` pick up the new certs (or there was a race condition, they _could_ have picked up the old certs too, but that's unlikely) and the old certs were put into `/var/run/secrets` because the ServiceAccount's Secrets were stored in etcd, which `setup-files` didn't touch.

@fgrzadkowski @huggsboson @thockin @mikedanese @vishh @pwittrock @eparis @bgrant0607
2016-04-01 14:47:17 -07:00
Lucas Käldström
858b9539d5 Fix so setup-files don't recreate/invalidate certificates that already exist 2016-04-01 21:23:58 +03:00
Matt Bruzek
64d849e4bb Unzipping the kubectl package to platforms so the validation script can find kubectl. 2016-04-01 13:19:17 -05:00
k8s-merge-robot
c6e995a824 Merge pull request #23558 from andyzheng0831/enhance
Automatic merge from submit-queue

Trusty: Regional release .tar.gz support

@zmerlynn and @roberthbailey please review it. This change is to support the feature added in PR #22234. The entire logic is pretty much the same as in #22234, with only few minor changes in implementation.

I had manually run e2e tests with "export RELEASE_REGION_FALLBACK=true" on two clusters: (1) Trusty on master nodes on ContainerVM; (2) Master and nodes all on trusty. All tests are green. I don't figure out a way to simulate regional fallback. But I did test the function download_or_bust() out-of-box.

cc/ @wonderfly @dchen1107 @fabioy FYI.
2016-04-01 03:39:08 -07:00
Alex Robinson
7135754f93 Merge pull request #23504 from mml/mb
Stop swallowing stdout and stderr when we check for the staging bucket.
2016-03-31 14:39:46 -07:00
Minhan Xia
d026d7ecbc Update cni binary 2016-03-31 13:57:51 -07:00
Alex Robinson
b60ef6f0dd Merge pull request #23593 from dchen1107/docker
Remove unnecessary override of /etc/init.d/docker on containervm image.
2016-03-31 13:31:52 -07:00
Alex Robinson
d41d50547d Merge pull request #23662 from ArtfulCoder/dockerscript
make docker-checker more robust
2016-03-31 10:53:39 -07:00
Abhishek Shah
736c02c7a0 make docker-checker more robust 2016-03-31 10:07:37 -07:00
Ross Kukulinski
0cf0bb00cd Add KUBERNETES_RELEASE option to get-kube.sh 2016-03-31 12:41:55 -04:00
CJ Cullen
26a6c66de5 Change kube-proxy & fluentd CPU request to 20m/80m. 2016-03-30 18:14:24 -07:00
k8s-merge-robot
be8ce6c385 Merge pull request #23353 from spiffxp/conformance-docs
Automatic merge from submit-queue

Update conformance test policy

Addresses #14913

/cc @kubernetes/sig-testing
2016-03-30 06:21:13 -07:00
k8s-merge-robot
c327879771 Merge pull request #23512 from Q-Lee/nanny-fix
Automatic merge from submit-queue

Create a new Deployment in kube-system for every version.

It appears that version numbers have already been properly added to these files. Small change to delete an old deployment entirely, so we can make a new one per version (like replication controllers).

We'll want to change this back once the kube-addons support deployments in a later version.
2016-03-29 20:59:46 -07:00
Mike Danese
ffa8bbde72 use apply instead of create to setup namespaces and tokens in addon manager 2016-03-29 16:41:53 -07:00
Mike Danese
0a821a473d stop create secrets for dns, it uses the kube-system service account now 2016-03-29 14:27:28 -07:00
Quintin Lee
0dcd49d584 Create a new Deployment in kube-system for every version. 2016-03-29 13:26:36 -07:00
Dawn Chen
c5ac60f584 Remove unnecessary override of /etc/init.d/docker on containervm image. 2016-03-29 12:35:13 -07:00
Andy Zheng
a83f11c484 Trusty: Regional release .tar.gz support 2016-03-28 15:21:14 -07:00
k8s-merge-robot
299de8e53c Merge pull request #23434 from andyzheng0831/kube-addon
Auto commit by PR queue bot
2016-03-27 21:48:47 -07:00
Lucas Käldström
2928d0a8ec Up to golang 1.6 2016-03-27 17:17:04 +03:00
k8s-merge-robot
3ec9f1e0a1 Merge pull request #23312 from mikedanese/static-routes-salt
Auto commit by PR queue bot
2016-03-26 12:29:40 -07:00
k8s-merge-robot
23fc7905c1 Merge pull request #23466 from andyzheng0831/fix
Auto commit by PR queue bot
2016-03-26 04:01:49 -07:00
Matt Liggett
300855c5bb Stop swallowing stdout and stderr when we check for the staging bucket.
Should help debug #23461
2016-03-25 15:01:21 -07:00