Commit Graph

121 Commits (9cff11dbb05b285ca78f3a9813d416696f678fb7)

Author SHA1 Message Date
Kubernetes Submit Queue 1388e664a4 Merge pull request #31637 from freehan/docker0fix
Automatic merge from submit-queue

keep docker0 with private cidr range

fixes: #31465

Keep docker0 when using kubenet on GCI. Assign 169.254.123.1/24 to docker0 to avoid cidr conflict.
2016-08-30 05:40:33 -07:00
Minhan Xia a876f22102 keep docker0 with private cidr range 2016-08-29 13:57:42 -07:00
Minhan Xia 69e540e634 bump cni to 9d5e6e6 2016-08-26 13:13:24 -07:00
Kubernetes Submit Queue f090fd158a Merge pull request #31367 from Amey-D/gci-kubelet
Automatic merge from submit-queue

gci: decouple from the built-in kubelet version

Prior to this change, configure.sh would:
(1) compare versions of built-in kubelet and downloaded kubelet, and
(2) bind-mount downloaded kubelet at /usr/bin/kubelet in case of
version mismatch
    
With this change, configure.sh:
(1) compares the two versions only on test clusters, and
(2) uses the actual file paths to start kubelet w/o any bind-mounting
    
To allow (2), this change also provides its own version of kubelet
systemd service file.
    
Effectively with this change we will always use the downloaded kubelet
binary along with its own systemd service file on non-test clusters.  The
main advantage is this change does not rely on the kubelet being built in to
the OS image.

@dchen1107 @wonderfly  can you please review

cc/ @kubernetes/goog-image FYI
2016-08-25 15:55:14 -07:00
Amey Deshpande 2939ebdba5 gci: decouple from the built-in kubelet version
Prior to this change, configure.sh would:
(1) compare versions of built-in kubelet and downloaded kubelet, and
(2) bind-mount downloaded kubelet at /usr/bin/kubelet in case of
version mismatch

With this change, configure.sh:
(1) compares the two versions only on test clusters, and
(2) uses the actual file paths to start kubelet w/o any bind-mounting

To allow (2), this change also provides its own version of kubelet
systemd service file.

Effectively with this change we will always use the downloaded kubelet
binary along with its own systemd service file on non-test clusters.  The
main advantage is this change does not rely on the kubelet being built in to
the OS image.
2016-08-24 23:36:08 -07:00
Aditya Kali acea7040bc Add validation for KUBE_USER
Malformed KUBE_USER causes error in cluster setup.
2016-08-24 15:01:11 -07:00
Kubernetes Submit Queue 6e75fa9745 Merge pull request #31103 from mwielgus/scheduling-alg-provider-flag
Automatic merge from submit-queue

Scheduling algorithm provider flag in kube-up.sh

Follow up of:

#30274 #30992

cc: @piosz @wojtek-t @davidopp
2016-08-23 01:44:54 -07:00
Jeff Lowdermilk 5def8f674a Fix feature_gate plumbing in gci configure-helper.sh 2016-08-22 21:53:25 -07:00
Quintin Lee 182a4fd0ac Scripts to configure image verification admission controller for gce. 2016-08-22 16:54:03 -07:00
Marcin Wielgus 11fabd7176 Scheduling algorithm provider flag in kube-up.sh 2016-08-22 17:49:00 +02:00
Kubernetes Submit Queue 70ba811663 Merge pull request #29995 from jszczepkowski/ha-poc
Automatic merge from submit-queue

Support for creation/removal of master replicas.

HA master: initial support for creation/removal of masters replicas by
kube-up/kube-down scripts for GCE on gci (other distributions, including debian, are not supported yet).
2016-08-21 15:20:23 -07:00
Kubernetes Submit Queue 9030a3234f Merge pull request #30859 from wojtek-t/allow_custom_etcd_in_e2e
Automatic merge from submit-queue

Add possibility to run non-default etcd image in tests

Ref #20504

@lavalamp @hongchaodeng @timothysc - FYI
2016-08-20 09:32:35 -07:00
Jeff Lowdermilk 51198f59da Add --feature-gates to kube-system components
apiserver,scheduler,controller-manager,proxy,kubelet all get
flag. Using one variable to plumb through config via salt/init
scripts for GCE and GKE
2016-08-19 09:07:43 -07:00
Kubernetes Submit Queue a24df66dc8 Merge pull request #30870 from piosz/rescheduler-setup
Automatic merge from submit-queue

Salt configuration for Rescheduler

ref #29023
2016-08-19 02:54:24 -07:00
Piotr Szczesniak 1f3fdab063 Salt configuration for Rescheduler 2016-08-18 12:24:09 +02:00
Wojciech Tyczynski 315d9f3689 Allow non-default etcd 2016-08-18 11:56:01 +02:00
Wojciech Tyczynski b42023eb03 Support for etcd migration 2016-08-18 08:31:33 +02:00
Timothy St. Clair 730fc70107 Update etcd default ports for v3, and validate tests 2016-08-17 07:49:19 -05:00
Jerzy Szczepkowski 05a41623b0 Support for creation/removes of master replicas.
HA master: initial support for creation/removal of masters replicas by
kube-up/kube-down scripts for GCE on gci.
2016-08-15 22:36:49 +02:00
Kubernetes Submit Queue 936c5171a5 Merge pull request #30503 from wojtek-t/optimize_gci
Automatic merge from submit-queue

Avoid unnecessary copies on GCI initialization.

The issue I faced was that when starting a cluster I was getting:
```
Aug 12 11:12:46 e2e-test-wojtekt-master configure.sh[1079]: cp: error writing '/home/kubernetes/kubernetes-src.tar.gz': No space left on device
```

This PR reduces amount of space that is needed on startup, as well as this speeds up starting cluster.

@lavalamp @dchen1107
2016-08-12 12:51:11 -07:00
Kubernetes Submit Queue 9fe15e7376 Merge pull request #29037 from matthewdupre/calico-policy-deploy
Automatic merge from submit-queue

Add support for kube-up.sh to deploy Calico network policy to GCI masters

Also remove requirement for calicoctl from Debian / salt installed nodes and clean it up a little by deploying calico-node with a manifest rather than calicoctl.  This also makes it more reliable by retrying properly.

How to use:
```
make quick-release
NETWORK_POLICY_PROVIDER=calico cluster/kube-up.sh
```

One place where I was uncertain:
- CPU allocations (on the master particularly, where there's very little spare capacity).  I took some from etcd, but if there's a better way to decide this, I'm happy to change it.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29037)
<!-- Reviewable:end -->
2016-08-12 08:12:01 -07:00
Wojciech Tyczynski 4d27f99997 Avoid unnecessary copies on GCI initialization. 2016-08-12 14:57:54 +02:00
Matt 568fb74a9a kube-up: move Calico policy components off master, and add support for GCI master 2016-08-11 17:11:16 -07:00
mbohlool a5b2ffffd2 Start etcd-empty-dir-cleanup pod automatically on master 2016-08-10 23:28:21 -07:00
Wojciech Tyczynski 679afea360 etcd3 support 2016-08-10 13:33:35 +02:00
Wojciech Tyczynski 38c28177d6 Propagate cluster size through salt 2016-08-09 09:41:48 +02:00
Kubernetes Submit Queue 10b1ffbed8 Merge pull request #30047 from zmerlynn/fix-aws-bringup
Automatic merge from submit-queue

AWS/GCE: Rework use of master name

* Add a pillar for `hostname` (because even if there's a good Salt function for it, I don't trust it to return the short hostname)
* Move `INITIAL_ETCD_CLUSTER` to just the GCE turn-up
* Remove `master_name`, which isn't needed
2016-08-05 02:00:54 -07:00
Kubernetes Submit Queue 6c81ba5b71 Merge pull request #30038 from adityakali/gci53
Automatic merge from submit-queue

Remove use of /usr/share/google/safe_format_and_mount script from GCI

This script was provided by Google Compute Image Packages
(https://github.com/GoogleCloudPlatform/compute-image-packages) and
has been deprecated since over an year. Newer version of the package
doesn't include it at all. So remove its usage and instead follow
recommended instructions from
https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting.

cc @kubernetes/goog-image
2016-08-05 00:54:20 -07:00
Zach Loafman 963a05ec72 AWS/GCE: Rework use of master name
* Add a pillar for hostname (because even if there's a good Salt
function for it, I don't trust it to return the short hostname)
* Move INITIAL_ETCD_CLUSTER to just the GCE turn-up
* Remove the master_name, which isn't needed as a pillar
2016-08-04 08:46:36 -07:00
Jerzy Szczepkowski c8d920ea6c Reverted conversion of influx-db to PetSet.
Reverted conversion of influx-db to PetSet.
2016-08-04 17:08:46 +02:00
Aditya Kali 40aeb2e6bb Remove use of /usr/share/google/safe_format_and_mount script
This script was provided by Google Compute Image Packages
(https://github.com/GoogleCloudPlatform/compute-image-packages) and
has been deprecated since over an year. Newer version of the package
doesn't include it at all. So remove its usage and instead follow
recommended instructions from
https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting.
2016-08-03 17:13:30 -07:00
Daniel Smith 651c8a4b2f Revert "Modified influxdb petset to provision persistent volume." 2016-08-02 14:03:37 -07:00
k8s-merge-robot fd4e923890 Merge pull request #29332 from caesarxuchao/gc-e2e
Automatic merge from submit-queue

[Garbage Collector] add e2e tests again

#27151 is reverted because gke didn't start correctly after it's merged (https://github.com/kubernetes/kubernetes/pull/27151#issuecomment-233030686).

The possible problem is the `unbound variable`, which is fixed in the second commit of this PR. However, I cannot verify if the PR will fail the gke suite since I don't have the environment to run that suite.

@wojtek-t @lavalamp
2016-08-02 13:26:43 -07:00
k8s-merge-robot cadee46753 Merge pull request #28840 from jszczepkowski/influx-ps
Automatic merge from submit-queue

Modified influxdb petset to provision persistent  volume.


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

[WIP] Modified influxdb petset to create claim.
2016-08-02 11:07:39 -07:00
Chao Xu 35193be088 plumb --enable_garbage_collector from environment variable;
adding a simple e2e test
2016-08-02 10:02:52 -07:00
Jerzy Szczepkowski f7167d11a8 Modified influxdb petset to provision pv.
Modified influxdb petset to provision pv.
2016-08-02 18:09:14 +02:00
Jerzy Szczepkowski 657b30ccf6 Modified etcd manifest to support clustering.
Modified etcd manifest to support clustering.
2016-07-30 16:01:04 +02:00
Daniel Smith fb3f02fb68 Revert "Modified etcd manifest to support clustering." 2016-07-27 12:03:21 -07:00
CJ Cullen 6d2c411757 Fix potential unbound KUBE_USER variable in gci/trusty. 2016-07-27 10:50:44 -07:00
Jerzy Szczepkowski 827ee794d6 Modified etcd manifest to support clustering.
Modified etcd manifest to support clustering.
2016-07-26 23:24:14 +02: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 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
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
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
Maisem Ali 97f3f80833 Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and
MASTER_OS_DISTRIBUTION.
2016-07-15 12:02:31 -07:00
Wojciech Tyczynski f71244975d Revert "[garbage collector] add e2e test" 2016-07-15 10:10:02 +02:00
k8s-merge-robot 01e34b72c1 Merge pull request #27151 from caesarxuchao/gc-e2e
Automatic merge from submit-queue

[garbage collector] add e2e test

This PR also includes some changes to plumb controller-manager's `--enable_garbage_collector` from the environment variable.

The e2e test will not be run by the core suite because it's marked `[Feature:GarbageCollector]`.

The corresponding jenkins job configuration PR is https://github.com/kubernetes/test-infra/pull/132.
2016-07-14 19:55:52 -07:00