Commit Graph

4126 Commits (12d923ed1583ac5cbec8d98003c7e08de5d1e9fd)

Author SHA1 Message Date
Jerzy Szczepkowski 827ee794d6 Modified etcd manifest to support clustering.
Modified etcd manifest to support clustering.
2016-07-26 23:24:14 +02:00
k8s-merge-robot d1734287cb Merge pull request #29475 from cjcullen/customuser
Automatic merge from submit-queue

export KUBE_USER to salt (support custom usernames) for vagrant, vsph…

GCE/GKE were handled in #29164, AWS was handled in #29428. This should cover the rest of the configurations that use ABAC.
2016-07-22 23:12:37 -07:00
k8s-merge-robot ffef5ad4c5 Merge pull request #29426 from justinsb/bump_kubeup_max_time
Automatic merge from submit-queue

kube-up: increase download timeout for kubernetes.tar.gz

Particularly on smaller instances on AWS, we were hitting the 80 second
timeout now that our image is well over the 1GB mark.

Increase the timeout from 80 seconds to 300 seconds.

Fix #29418
2016-07-22 21:03:49 -07:00
k8s-merge-robot 64d185f534 Merge pull request #29474 from luxas/cni_cross
Automatic merge from submit-queue

Include CNI for all architectures in the hyperkube image

Can some of you (@jfrazelle @mikedanese) quickly lgtm this?
I'd like it if we got it merged before v1.4.0-alpha.2

It's not a huge change, I'm just cross-compiling this CNI stuff while waiting for the v0.4.0 which likely will release binaries for all arches.
2016-07-22 17:13:22 -07:00
k8s-merge-robot 3d162d0400 Merge pull request #29427 from justinsb/aws_master_os_distribution
Automatic merge from submit-queue

AWS kube-up: fix MASTER_OS_DISTRIBUTION

On AWS we were defining KUBE_MASTER_OS_DISTRIBUTION, but the scripts
expect MASTER_OS_DISTRIBUTION.

Fixes #29422
2016-07-22 15:35:20 -07:00
CJ Cullen 861583ac3e export KUBE_USER to salt (support custom usernames) for vagrant, vsphere, photon, openstack. 2016-07-22 15:22:03 -07:00
Lucas Käldström 8786dab70a Include CNI for all architectures in the hyperkube image 2016-07-23 01:03:46 +03:00
Hongchao Deng 74e6626967 Update etcd deprecated flag
- "-addr" => "--advertise-client-urls"
- "-bind-addr" => "--listen-client-urls"
2016-07-22 11:01:11 -07:00
k8s-merge-robot f37cadd357 Merge pull request #29445 from wojtek-t/fix_kubemark_after_ip_address_machinations
Automatic merge from submit-queue

Fix Kubemark config after IP addresses machinations
2016-07-22 03:44:46 -07:00
Wojciech Tyczynski 28205d6a43 Fix Kubemark config after IP addresses machinations 2016-07-22 11:49:15 +02:00
Justin Santa Barbara 55d0d3b4fa AWS kube-up: export kube_user to salt
This was done for GCE in #29164, but not for AWS.

Fixes #29424
2016-07-22 00:46:03 -04:00
Justin Santa Barbara 49da8298c9 AWS kube-up: fix MASTER_OS_DISTRIBUTION
On AWS we were defining KUBE_MASTER_OS_DISTRIBUTION, but the scripts
expect MASTER_OS_DISTRIBUTION.

Fixes #29422
2016-07-22 00:45:05 -04:00
Justin Santa Barbara eb3483eaba kube-up: increase download timeout for kubernetes.tar.gz
Particularly on smaller instances on AWS, we were hitting the 80 second
timeout now that our image is well over the 1GB mark.

Increase the timeout from 80 seconds to 300 seconds.

Fix #29418
2016-07-22 00:39:35 -04:00
CJ Cullen e559e305dd append an abac rule for $KUBE_USER. 2016-07-21 09:40:39 -07:00
k8s-merge-robot 20246986df Merge pull request #29295 from fgrzadkowski/ha_master
Automatic merge from submit-queue

Add load balancer in front of apiserver in HA master setup

The first commit is just https://github.com/kubernetes/kubernetes/pull/29201 and has been already LGTMed.

Second commit has some small fixes:
1. Precompute REGION variable in config
2. Add timeout for waiting for loadbalancer
3. Fix kube-down so that it doesn't delete some resources if there are still masters/nodes in other zones

Second commit also fixes bug in https://github.com/kubernetes/kubernetes/pull/29201 where variable `REGION` was unset in `kube-down` when deleting master IP. The bug caused leaking of IP addresses. 

https://github.com/kubernetes/kubernetes/issues/21124

@davidopp @jszczepkowski @wojtek-t @mikedanese
2016-07-21 08:32:30 -07:00
Wojciech Tyczynski e31926def9 Allow for increasing qps limits in kubemark 2016-07-21 10:07:53 +02:00
Zach Loafman 0750eaf533 AWS kube-up: Fix unbound KUBE_MANIFESTS_TAR_URL variable in Salt config
It shouldn't be necessary for all distros to define this env variable.
2016-07-20 10:50:34 -07:00
Filip Grzadkowski e9585fba91 1. Precompute REGION variable in config
2. Add timeout for waiting for loadbalancer
3. Fix kube-down so that it doesn't delete some resources if there are still masters/nodes in other zones
2016-07-20 17:25:25 +02:00
k8s-merge-robot a93fbb108a Merge pull request #29235 from luxas/bump_etcd
Automatic merge from submit-queue

Bump the default etcd version in the Makefile to 3.0.3

Fixes: #29132

I haven't had time to manually validate the arm and arm64 version yet, but I think it should be fine.

cc @xiang90 @hongchaodeng @timothysc @lavalamp @wojtek-t @thockin @kubernetes/sig-scalability @Pensu @laboger
2016-07-20 07:52:14 -07:00
Filip Grzadkowski 70bb57a3e1 Revert "Merge pull request #29278 from kubernetes/revert-29201-ha_master"
This reverts commit ecebdb5707, reversing
changes made to 976ca09d71.
2016-07-20 16:37:31 +02:00
Filip Grzadkowski 194895740c Revert "Add and delete load balancer in front of apiserver." 2016-07-20 14:02:59 +02:00
Piotr Szczesniak 976ca09d71 Merge pull request #29201 from fgrzadkowski/ha_master
Add and delete load balancer in front of apiserver.
2016-07-20 09:38:19 +02:00
k8s-merge-robot 5df9284ff4 Merge pull request #26746 from MHBauer/enable-ssh-compression
Automatic merge from submit-queue

Ubuntu: Enable ssh compression when downloading binaries during cluster creation

<!--
Checklist for submitting a Pull Request

Please remove this comment block before submitting.

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
3. If you want this PR to automatically close an issue when it is merged,
   add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>`
   to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests).
4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.
-->
resolves #20971 by using the options provided by ssh. 

Native ssh compression has existed for years, and the server is free to disregard the setting, so this should be safe.

With things like the kube binaries I see about a 2x speed increase. 

```
λ time scp kubes-bin.tar   9.30.182.251:/mnt/build/kubin
kubes-bin.tar                                                                                                            100%  344MB  10.7MB/s   00:32

real	0m32.284s
user	0m1.679s
sys	0m1.263s

λ time scp -C kubes-bin.tar   9.30.182.251:/mnt/build/kubin
kubes-bin.tar                                                                                                            100%  344MB  22.9MB/s   00:15

real	0m14.810s
user	0m12.858s
sys	0m0.994s

λ ls -lah kubes-bin.tar
-rw-r--r--  1 mhb  staff   344M Jun  2 15:29 kubes-bin.tar

λ tar -tf kubes-bin.tar
kubectl
master/
master/etcd
master/etcdctl
master/flanneld
master/kube-apiserver
master/kube-controller-manager
master/kube-scheduler
node/
node/flanneld
node/kube-proxy
node/kubelet
```
2016-07-19 19:21:46 -07:00
Lucas Käldström 62357bd767 Bump etcd version to 3.0.3 2016-07-20 01:10:49 +03:00
Filip Grzadkowski 5c0f0daae0 Add and delete load balancer in front of apiserver. 2016-07-19 16:44:21 +02:00
k8s-merge-robot c31882a5f2 Merge pull request #29140 from maisem/gce_on_cvm
Automatic merge from submit-queue

Fixing kube-up for CVM masters.

@roberthbailey @zmerlynn
2016-07-18 20:06:56 -07:00
k8s-merge-robot 8b16c75ba5 Merge pull request #29139 from adityakali/logrotate.1
Automatic merge from submit-queue

fix logrotate config (again)

we need to add the dateformat option so that the logrotate
can create unique logfiles for each rotation. Without this,
logrotation is skipped with message like (generated in
verbose mode of logrotate):

rotating log /var/log/rotate-test.log, log->rotateCount is 5
dateext suffix '-20160718'
glob pattern '-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
destination /var/log/rotate-test2.log-20160718.gz already exists, skipping rotation

Tested as follows:
  # config in '/etc/logrotate.d/rotate-test':
  /var/log/rotate-test.log {
    rotate 5
    copytruncate
    missingok
    notifempty
    compress
    maxsize 100M
    daily
    dateext
    dateformat -%Y%m%d-%s
    create 0644 root root
  }

  # create 150Mb of /var/log/rotate-test.log
  $ dd if=/dev/zero of=/var/log/rotate-test.log bs=1048576 count=150 conv=notrunc oflag=append

  # run logrotate
  $ /usr/sbin/logrotate -v /etc/logrotate.conf
  ...
  rotating pattern: /var/log/rotate-test.log  after 1 days (5 rotations)
  empty log files are not rotated, log files >= 104857600 are rotated earlier, old logs are removed
  considering log /var/log/rotate-test.log
    log needs rotating
  rotating log /var/log/rotate-test.log, log->rotateCount is 5
  Converted ' -%Y%m%d-%s' -> '-%Y%m%d-%s'
  dateext suffix '-20160718-1468875268'
  glob pattern '-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
  copying /var/log/rotate-test.log to /var/log/rotate-test.log-20160718-1468875268
  truncating /var/log/rotate-test.log
  compressing log with: /bin/gzip

  Repeating 'dd' and 'logrotate' commands now generate logfiles correctly.

#27754 
@bprashanth can you please review?
2016-07-18 18:20:41 -07:00
k8s-merge-robot 1d9199628f Merge pull request #29141 from zmerlynn/fix-node-prefix
Automatic merge from submit-queue

GCE bring-up: Differentiate NODE_TAGS from NODE_INSTANCE_PREFIX
2016-07-18 17:11:40 -07:00
k8s-merge-robot d90e3761ef Merge pull request #28489 from liyimeng/patch-1
Automatic merge from submit-queue

hyperkube: fix build for 3rd party registry (again)


Fixes issue #28487 

This is a minor fix for the issue reported in #28487
2016-07-18 17:11:35 -07:00
Aditya Kali 09b2c27a92 fix logrotate config (again)
we need to add the dateformat option so that the logrotate
can create unique logfiles for each rotation. Without this,
we logrotation is skipped with message like (generated in
verbose mode of logrotate):

rotating log /var/log/rotate-test.log, log->rotateCount is 5
dateext suffix '-20160718'
glob pattern '-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
destination /var/log/rotate-test2.log-20160718.gz already exists, skipping rotation

Tested as follows:

  # config in '/etc/logrotate.d/rotate-test':
  /var/log/rotate-test.log {
    rotate 5
    copytruncate
    missingok
    notifempty
    compress
    maxsize 100M
    daily
    dateext
    dateformat -%Y%m%d-%s
    create 0644 root root
  }

  # create 150Mb of /var/log/rotate-test.log
  $ dd if=/dev/zero of=/var/log/rotate-test.log bs=1048576 count=150 conv=notrunc oflag=append

  # run logrotate
  $ /usr/sbin/logrotate -v /etc/logrotate.conf
  ...
  rotating pattern: /var/log/rotate-test.log  after 1 days (5 rotations)
  empty log files are not rotated, log files >= 104857600 are rotated earlier, old logs are removed
  considering log /var/log/rotate-test.log
    log needs rotating
  rotating log /var/log/rotate-test.log, log->rotateCount is 5
  Converted ' -%Y%m%d-%s' -> '-%Y%m%d-%s'
  dateext suffix '-20160718-1468875268'
  glob pattern '-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
  copying /var/log/rotate-test.log to /var/log/rotate-test.log-20160718-1468875268
  truncating /var/log/rotate-test.log
  compressing log with: /bin/gzip

  Repeating 'dd' and 'logrotate' commands now generate logfiles correctly.
2016-07-18 15:37:00 -07:00
Maisem Ali fe14340051 Fixing kube-up for CVM masters. 2016-07-18 14:21:41 -07:00
Zach Loafman 4c667c38c9 GCE bring-up: Differentiate NODE_TAGS from NODE_INSTANCE_PREFIX
Kubernetes-side fix to #29074 (GKE-side fix necessary as well)
2016-07-18 14:20:45 -07:00
Prashanth Balasubramanian 1173dd13bf Change maxsize to size in logrotate. 2016-07-18 11:30:50 -07:00
k8s-merge-robot 36c07cc554 Merge pull request #27961 from maisem/os-distribution
Automatic merge from submit-queue

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and MASTER_OS_DISTRIBUTION

fixes #26183 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-15 14:11:47 -07:00
Maisem Ali 97f3f80833 Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and
MASTER_OS_DISTRIBUTION.
2016-07-15 12:02:31 -07:00
Mike Danese 95e2e299a9 move kube-dns to the cluster/addons/ directory 2016-07-14 11:44:00 -07:00
k8s-merge-robot ae990defcf Merge pull request #26956 from joe2far/fix-typos
Automatic merge from submit-queue

Fixed several typos
2016-07-14 04:13:15 -07:00
k8s-merge-robot febd37b148 Merge pull request #28164 from intelsdi-x/dont_set_provider_for_conformance_tests
Automatic merge from submit-queue

Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set

fixes #26269
same as #26530 - i accidentally lost my fork and couldn't rebase there ;)
@mikedanese PTAL
2016-07-14 02:53:08 -07:00
k8s-merge-robot 5b92ee2155 Merge pull request #28823 from zenly/master
Automatic merge from submit-queue

ConfigMap added to kube addon manager

fixes #28775
2016-07-13 16:43:19 -07:00
k8s-merge-robot f9a45e6983 Merge pull request #28673 from cheld/add-cni-config
Automatic merge from submit-queue

add default flannel configuration for cni

I added a default flannel configuration for cni.

So hyperkube can be started with:
```
--network-plugin=kubenet
```
or with flannel:

```
--network-plugin=cni
--network-plugin-dir=/etc/cni/net.d
```

Requires update of cni binaries to 0.3.0 or later to work. See also https://github.com/kubernetes/kubernetes/issues/27603

This PR is intended to support multi-node Hyperkube 
https://github.com/kubernetes/kube-deploy/pull/115



CC @zreigz  

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 14:42:07 -07:00
k8s-merge-robot 783aa1a28b Merge pull request #28872 from lojies/sshoptadd
Automatic merge from submit-queue

Add SSH_OPTS to config ssh and scp port

Add SSH_OPTS support.This can change ssh and scp default port.

fixes #17934
2016-07-13 12:54:25 -07:00
k8s-merge-robot 753ba9f6fe Merge pull request #28806 from silasbw/ubuntu-version-0
Automatic merge from submit-queue

cluster/ubuntu/download-release.sh: if $KUBE_VERSION is set, use it.

```release-note
If $KUBE_VERSION is set in cluster/ubuntu/download-release.sh use that version, 
otherwise set it to the result of `get_latest_version_number`.
```

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 12:54:20 -07:00
k8s-merge-robot 2906a35c1a Merge pull request #28745 from justinsb/fix_28644
Automatic merge from submit-queue

kube-up: install new Docker pre-requisite (libltdl7) when not in image

Docker now has a dependency on libltdl7; we have to specify it manually
if we are installing docker using dpkg (vs using apt-get or similar,
which would pull it in automatically)

Fixes #28644
2016-07-13 10:17:15 -07:00
joe2far 5ead89b5bb Fixed several typos 2016-07-13 15:06:24 +01:00
Tim Hockin 9613e15801 Make releases work 2016-07-12 21:52:54 -07:00
Tim Hockin 881e21c2d5 Link _output/bin/ to real binaries for this arch
This makes followup commits easier wrt finding binaries during build.
2016-07-12 21:52:00 -07:00
Tim Hockin faeef5c4ae Use make as the main build tool
This allows us to start building real dependencies into Makefile.

Leave old hack/* scripts in place but advise to use 'make'.  There are a few
rules that call things like 'go run' or 'build/*' that I left as-is for now.
2016-07-12 21:52:00 -07:00
lojies b00902c9f7 Add SSH_OPTS to config ssh and scp port 2016-07-13 09:42:27 +08:00
Mike Danese c5b5e1f28e fix image staging to non gcr.io repos 2016-07-12 13:46:00 -07:00
Silas Boyd-Wickizer 35e190e6ae cluster/ubuntu/download-release.sh: if $KUBE_VERSION is set, use it.
If $KUBE_VERSION is not set, set it to the result of
`get_latest_version_number`.
2016-07-11 16:29:00 -07:00