Commit Graph

4102 Commits (d5ca65b63fa6245a853b44bc1e8d08848f2012cf)

Author SHA1 Message Date
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
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
Minhan Xia 0bd411878a bump cni version 2016-07-11 14:33:01 -07:00
Pawel Skrzynski 50751f73ab Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set 2016-07-11 18:43:37 +02:00
Douglas Gibbons 2a589b0963 ConfigMap added to kube addon manager. 2016-07-11 13:54:18 +01:00
Justin Santa Barbara 4bde831fad kube-up: install libltdl7 when installing docker with dpkg
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-10 19:45:41 -04:00
k8s-merge-robot f83f21f399 Merge pull request #28623 from elsonrodriguez/openstack-release-tar-fix
Automatic merge from submit-queue

Fixes #28205, Check release tar location for Openstack-Heat provider

This does a basic check to see where the release tars are located.

Allows people to use openstack-heat outside of compiling k8s.
2016-07-08 13:32:14 -07:00
Elson Rodriguez fbd0ba074e Fixes #28205, Check release tar location for Openstack-Heat provider
This does a basic check to see where the release tars are located.

Allows people to use openstack-heat outside of compiling k8s.
2016-07-08 08:45:47 -07:00
Christoph Held d659c16eb4 add default flannel configuration for cni 2016-07-08 11:36:17 +02:00
k8s-merge-robot 2296108886 Merge pull request #28549 from caseydavenport/cd-default-netpol
Automatic merge from submit-queue

Enable extensions/v1beta1/NetworkPolicy by default

Fixes https://github.com/kubernetes/kubernetes/issues/28401

For some reason this also triggered an update to the swagger spec (which apparently hadn't been done before but wasn't failing validation...)
2016-07-08 01:39:15 -07:00
k8s-merge-robot 9fb45943b5 Merge pull request #28467 from gmarek/addon-manager
Automatic merge from submit-queue

Fix the way addon-manager handles non-namespaced objects

Fixes #28451

cc @wojtek-t
2016-07-07 13:56:21 -07:00
allenmiller 727bd438de Remove unbalanced right-paren 2016-07-07 11:06:01 -07:00
Casey Davenport 097e186e84 Remove --runtime-config logic from kube-up 2016-07-07 10:04:46 -07:00
k8s-merge-robot acda24ae25 Merge pull request #27805 from janetkuo/change-redis-image-gcr
Automatic merge from submit-queue

Change redis image gcr

Follow up https://github.com/kubernetes/kubernetes/pull/27577#discussion_r67809871:
> Any chance we can move these images somewhere in gcr.io?

I pushed `kubernetes/redis:v1` to `gcr.io/google_containers/redis:v1`.  


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-07 00:53:44 -07:00
Madhusudan.C.S 2e308035f0 Copy FEDERATIONS_DOMAIN_MAP to a local variable since the helper script doesn't allow overwriting the existing variable. 2016-07-06 15:53:45 -07:00
Janet Kuo 6a60f8e542 Moving kubernetes/redis:v1 image to gcr.io 2016-07-06 11:03:38 -07:00
k8s-merge-robot 203e1e9663 Merge pull request #26446 from mbruzek/juju-master-worker
Automatic merge from submit-queue

Implementing a proper master/worker split in the juju cluster code.

```
release-note-none
```

General updates to the cluster/juju Kubernetes provider, to bring it up to date.

Updating the skydns templates to version 11
Updating the etcd container definition to include arch.
Updating the master template to include arch and version for hyperkube container.
Adding dns_domain configuration options.
Adding storage layer options.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-05 18:50:40 -07:00
k8s-merge-robot 5e7c309b29 Merge pull request #25473 from andreykurilin/get_kube
Automatic merge from submit-queue

Check existence of kubernetes dir for get-kube.sh

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

There are a lot of references to https://get.k8s.io/ over the internet.
Most of such references do not describe KUBERNETES_SKIP_DOWNLOAD env variable
and newbies can get into a situation described below:

- execute `wget -q -O - https://get.k8s.io | bash`
- receive a failure due too missed packages or some configs
- fix the issue
- try again `wget -q -O - https://get.k8s.io | bash`

In this case, get-kube.sh will not check that kubernetes directory already
exist and repeat download again.
Lets make get-kube.sh more user-friendly and check existence of kubernetes dir
2016-07-05 11:27:47 -07:00
Matt Bruzek b45002b2b2 Implementing a proper master/worker split in k8s.py
Updating the skydns templates to version 11
Updating the etcd container definition to include arch.
Updating the master template to include arch and version for hyperkube container.
Adding dns_domain configuration options.
Adding storage layer options.
Fixing underscore problem and adding exceptions.

Fixing the underscore flag errors.
2016-07-05 11:16:41 -05:00
gmarek 0c60cfc98d Fix the way addon-manager handles non-namespaced objects 2016-07-05 10:37:30 +02:00
Liyi Meng 0262c0dc72 Fix issue #28487
This is a minor fix for the issues report in #28487
2016-07-05 10:05:19 +02:00
k8s-merge-robot 85f75daf25 Merge pull request #28268 from cjcullen/expr
Automatic merge from submit-queue

Make GKE detect-instance-groups work on Mac.

Make the fix from #27803 also work on mac.

The GNU `expr` command supports both the `expr match STRING REGEXP` and `expr STRING : REGEXP` command syntax.

The BSD `expr` command only has the `expr STRING : REGEXP` syntax.

@fabioy @a-robinson
2016-07-01 21:41:11 -07:00
k8s-merge-robot c3e9485dfa Merge pull request #28247 from girishkalele/skydns_godep_up
Automatic merge from submit-queue

Bump skydns godeps to latest

Update Godeps for github.com/skynetservices/skydns and miekg/dns.

Bump kubedns version to 1.6 with latest skynetservices/skydns code
    
Built kube-dns for all architectures and pushed containers to gcr.io.
2016-06-30 11:19:46 -07:00
Girish Kalele 8614be3c71 Bump kubedns version to 1.6 with latest skynetservices/skydns code
Built kube-dns for all architectures and pushed containers to gcr.io
2016-06-30 10:45:00 -07:00
CJ Cullen 65ab7040a7 Make GKE detect-instance-groups work on Mac. 2016-06-29 22:49:26 -07:00
k8s-merge-robot f2ddd60eb9 Merge pull request #26755 from david-mcmahon/fix-headers
Automatic merge from submit-queue

Remove "All rights reserved" from all the headers.

cc @thockin @zmerlynn @brendanburns
2016-06-29 18:46:07 -07:00