Commit Graph

4659 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
14495fed7c Merge pull request #35717 from vishh/rkt-v1.18.0
Automatic merge from submit-queue

Update rkt version on GCI nodes to v1.18.0

v1.18.0 avoids outputting debug information by default which happens to
pollute events and kubelet logs.
2016-10-28 03:10:30 -07:00
Marek Grabowski
765f7b9406 Revert "Enable containerized storage plugins mounter on GCI" 2016-10-28 08:41:43 +02:00
Kubernetes Submit Queue
e37b7cbde0 Merge pull request #35663 from janetkuo/statefulset
Automatic merge from submit-queue

Rename PetSet to StatefulSet

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: #35534

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: 

**Special notes for your reviewer**: cc @erictune @foxish @kubernetes/sig-apps @ymqytw 

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
```
2016-10-27 20:16:50 -07:00
Kubernetes Submit Queue
52988de1ee Merge pull request #35350 from vishh/enable-gci-cmount
Automatic merge from submit-queue

Enable containerized storage plugins mounter on GCI

```release-note
On GCI, kubelet uses an external mounter script (typically a special container running in a chroot) to perform mount operations
```
2016-10-27 19:33:13 -07:00
Janet Kuo
10aee82ae3 Rename PetSet API to StatefulSet 2016-10-27 17:25:10 -07:00
Kubernetes Submit Queue
0b9547f6ad Merge pull request #35668 from MrHohn/addon-manager-changelog
Automatic merge from submit-queue

Added Changelog to addon manager

From #35651.

It would be good to have this changelog recording who and when pushed a new image to gcr.io. I retrieved the information from the [commit history](https://github.com/kubernetes/kubernetes/commits/master/cluster/addons/addon-manager).

@mikedanese
2016-10-27 16:47:09 -07:00
Kubernetes Submit Queue
90f4ceefc4 Merge pull request #35349 from vishh/gci-cmount
Automatic merge from submit-queue

Update GCI mounter script to run in a rkt container

Depends on #35652
2016-10-27 13:49:37 -07:00
Zihong Zheng
c449ef8a25 Added CHANGELOG to addon manager 2016-10-27 12:31:19 -07:00
Vishnu kannan
c556b33bd6 update rkt to v1.18.0 which avoids outputting debug information by default
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 12:24:29 -07:00
Vishnu kannan
aceddfa7fc Enable containerized storage mounter on GCI
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 11:56:34 -07:00
Vishnu kannan
64c1fa3594 run the gci containerized mounter to cache mounter container image
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 11:56:34 -07:00
Kubernetes Submit Queue
b47d862aea Merge pull request #34696 from wojtek-t/restore_etcd_from_backup
Automatic merge from submit-queue

Restore etcd from backup

The new script performs disaster recovery of etcd from backup.

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

@alex-mohr @lavalamp @kubernetes/goog-gke
2016-10-27 11:55:46 -07:00
Dawn Chen
9001ccfcb0 Merge pull request #35705 from mtaufen/new-cvm-test
Bump container-vm version in config-test.sh
2016-10-27 11:08:09 -07:00
Michael Taufen
c6ab060fa1 Bump container-vm version in config-test.sh
So we can qualify the new container-vm image against our full set of
active tests.
2016-10-27 09:38:27 -07:00
Vishnu kannan
19c19c2e0f Updating GCI mounter to be containerized
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 09:37:08 -07:00
David Ashpole
eb19713486 kubelet calls GetDirFsInfo(root directory) instead of using GetFsInfo(root label). Reverted #33520, and changed e2e test context to use nodefs 2016-10-27 08:04:59 -07:00
Kubernetes Submit Queue
f11d01076e Merge pull request #35503 from wojtek-t/fix_migration
Automatic merge from submit-queue

Fix migration script to make it sh-friendly

Ref #22448

There is no bash in etcd image, so the script needs to be "sh-friendly".

Also, few fixes to the script.
2016-10-27 02:59:37 -07:00
Wojciech Tyczynski
44e66a97f3 Fix migration script 2016-10-27 10:17:56 +02:00
Kubernetes Submit Queue
1b62e4c047 Merge pull request #34370 from ixdy/centos-kubernetes-tar-gz
Automatic merge from submit-queue

Centos: download client and server tarballs instead of mondo-tarball

Part of https://github.com/kubernetes/kubernetes/issues/28629 / https://github.com/kubernetes/kubernetes/issues/28435.

This should be functionally the same, except that you will download ~1/3 the bytes.
2016-10-26 23:59:06 -07:00
Kubernetes Submit Queue
e233f14ad5 Merge pull request #35656 from rmmh/sha1sum
Automatic merge from submit-queue

Prefer sha1sum (C) to shasum (Perl).

This should avoid spamming build-log.txt with messages like:

    perl: warning: Setting locale failed.
    perl: warning: Please check that your locale settings:
        LANGUAGE = (unset),
        LC_ALL = (unset),
        LANG = "en_US.UTF-8"
        are supported and installed on your system.
    perl: warning: Falling back to the standard locale ("C").

OSX has shasum but not sha1sum, which is part of GNU coreutils.
2016-10-26 22:32:35 -07:00
Kubernetes Submit Queue
10061ac358 Merge pull request #35523 from luxas/remove_reconcile
Automatic merge from submit-queue

Deprecate the --reconcile-cidr flag

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: Follows up https://github.com/kubernetes/kubernetes/pull/34906

**Special notes for your reviewer**: I'm not sure why coreos had set `--reconcile-cidr` to `false` and what the implications are now.

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
Deprecate the --reconcile-cidr kubelet flag because it has no function anymore
```

PTAL @thockin @freehan @justinsb @yujuhong 
@kubernetes/sig-node @kubernetes/sig-network 

**I will add `hack/update-all.sh` contents soon to fix builds**
2016-10-26 20:18:37 -07:00
Kubernetes Submit Queue
ab0ee35462 Merge pull request #35651 from caesarxuchao/remove-label-selectors
Automatic merge from submit-queue

Sending #35255 again: Remove versioned LabelSelectors

ref #35255: "Remove versioned LabelSelectors"

FYI @smarterclayton
2016-10-26 18:21:22 -07:00
Ryan Hitchman
5e54fa72c6 Prefer sha1sum (C) to shasum (Perl).
This should avoid spamming build-log.txt with messages like:

    perl: warning: Setting locale failed.
    perl: warning: Please check that your locale settings:
        LANGUAGE = (unset),
        LC_ALL = (unset),
        LANG = "en_US.UTF-8"
        are supported and installed on your system.
    perl: warning: Falling back to the standard locale ("C").

OSX has shasum but not sha1sum, which is part of GNU coreutils.
2016-10-26 16:15:03 -07:00
Chao Xu
9a669b31d3 increment kube-addon-manager version number;
remove non-existent kube-addon-update.sh from kube-addon Dockerfile
2016-10-26 14:38:51 -07:00
Kubernetes Submit Queue
ef7458d45b Merge pull request #35573 from ixdy/get-kube-binaries-script
Automatic merge from submit-queue

Make get-kube.sh smarter when choosing if it should download

The #19404 fix for #15197 doesn't work very well when this script is used in CI

Since our kubernetes release tarballs are always named `kubernetes.tar.gz`, checking timestamps alone won't guarantee we do the right thing. If we're trying to extract a different release than the version currently downloaded, both `curl` and `wget` will just use the preexisting version.

My change makes the caching a bit more explicit; we look inside the kubernetes tarball for the `version` file and compare that to the release requested.

I've also added some code to automatically delete the preexisting `kubernetes/` directory so that we don't get into a weird state with multiple versions extracted into the same root.

This is a lot of shell, and I've tested the various branches manually, but we definitely need a better way to automate testing this (or simplify/remove some of the functionality).

cc @fejta @spxtr @nagarjung @roberthbailey
2016-10-26 14:23:40 -07:00
Jeff Grafton
db3fd62f1d Make get-kube.sh smarter when choosing if it should download 2016-10-26 11:17:56 -07:00
Lucas Käldström
6846e0b48a Remove usage of --reconcile-cidr 2016-10-26 20:26:07 +03:00
Kubernetes Submit Queue
5a0c22e09a Merge pull request #35619 from wojtek-t/fix_kubemark_cidr
Automatic merge from submit-queue

Fix too small network for kubemark
2016-10-26 10:23:45 -07:00
gmarek
c9f8558a61 Revert "increment kube-addon-manager version number;"
This reverts commit 1f599af791.
2016-10-26 14:33:08 +02:00
Wojciech Tyczynski
4e4f608952 Fix too small network for kubemark 2016-10-26 13:26:03 +02:00
Wojciech Tyczynski
2725393fdf Restore from backup 2016-10-26 09:59:36 +02:00
Chao Xu
1f599af791 increment kube-addon-manager version number;
remove non-existent kube-addon-update.sh from kube-addon Dockerfile
2016-10-25 22:09:02 -07:00
Vishnu kannan
bbc8183887 Adding rkt binary to GCI nodes via cloud-init.
This is required for mounting storage volumes via containers.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-25 12:38:15 -07:00
Kubernetes Submit Queue
bcdb218532 Merge pull request #35267 from stepstone-tech/master
Automatic merge from submit-queue

fixed problem with non masquerade cidr in kube-up gce/gci

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:
fixed typo in script which made setting custom cidr in gce using kube-up impossible

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note 
fixed typo in script which made setting custom cidr in gce using kube-up impossible
```
2016-10-25 12:36:00 -07:00
Kubernetes Submit Queue
f59f948abd Merge pull request #35224 from vishh/mounter-image
Automatic merge from submit-queue

Adding a new docker container for performing mounts on GCI

cc @saad-ali @jingxu97 @mtaufen
2016-10-25 11:54:11 -07:00
Kubernetes Submit Queue
25f2fba0e0 Merge pull request #35338 from imikushin/fix-build-addon-manager
Automatic merge from submit-queue

Fix addon-manager image build
2016-10-25 11:02:18 -07:00
Yu-Ju Hong
94f580ef03 Revert "bootstrap: Start hostNetwork pods even if network plugin not ready" 2016-10-25 08:38:59 -07:00
Mik Vyatskov
4bf28d6bfc Update heapster for coreos configuration 2016-10-25 13:14:35 +02:00
Mike Danese
27116c6818 rename build/ to build-tools/ 2016-10-24 14:41:56 -07:00
Kubernetes Submit Queue
4fbbc746a0 Merge pull request #35161 from mtaufen/mike-klet-cmount-node-e2e
Automatic merge from submit-queue

e2e node plumbing and bundling for GCI mounter

**Note:** The code in this PR only bundles the mounter and modifies `--mounter-path` if it can find `cluster/gce/gci/mounter` in the K8s source dir when building the test bundle.

This bundles the mounter script for GCI with the node e2e tests and allows the `--mounter-path` to be passed to the Kubelet via the node test framework. The node test runner will detect when we are running on a remote GCI node and add the appropriate `--mounter-path` to the `testArgs`. 

It also includes a simple node test that mounts a tmpfs volume. This will exercise the Kubelet's mounter code path. 

**ITEM OF NOTE:** To get the k8s root dir (in order to copy the mount script into the tarball), I changed `getK8sRootDir` -> `GetK8sRootDir` in `test/e2e_node/build/build.go`. Based on the comment above that function (and the fact that it was private to begin with), I'm not sure this is the best way to do things:
```
// TODO: Dedup / merge this with comparable utilities in e2e/util.go
```
On the other hand, the `e2e/util.go` file mentioned in that comment doesn't exist anymore. This should be resolved before this PR is merged.
2016-10-24 14:22:57 -07:00
Kubernetes Submit Queue
9e50b284af Merge pull request #35435 from Crassirostris/grafana-usage-update
Automatic merge from submit-queue

Update grafana in kubernetes to version 3.1.1

Fix #33775

```release-note
Update grafana version used by default in kubernetes to 3.1.1
```

@piosz
2016-10-24 13:38:07 -07:00
Kubernetes Submit Queue
c3d104a38f Merge pull request #35365 from vmware/fix-vm-name-resolv.kerneltime
Automatic merge from submit-queue

vSphere Kube-up: resolve vm-names on all nodes.

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:
This addresses the #35364

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
fixes #35364
**Special notes for your reviewer**:
Will cherry pick to release-1.4

```release-note
vSphere Kube-up: resolve vm-names on all nodes
```
2016-10-24 13:37:57 -07:00
Mik Vyatskov
bb4ba53de2 Update grafana in kubernetes to version 3.1.1 2016-10-24 16:46:30 +02:00
Vish Kannan
a8db72c4a3 Do not enable the new mounter on GCI nodes 2016-10-24 05:50:24 -07:00
Michael Taufen
f819cada9c Add a bare-bones level of indirection for GCI mounter
This is the bare bones scaffolding from @vishh's PR #34787
2016-10-24 05:50:24 -07:00
Kubernetes Submit Queue
33ebe1f18b Merge pull request #34905 from ingvagabund/client-to-clientset
Automatic merge from submit-queue

Replace client with clientset

Replace client with clientset in some places

Fixes: #34637
2016-10-24 05:38:43 -07:00
Kubernetes Submit Queue
3c84164bdf Merge pull request #33347 from justinsb/fix_32900
Automatic merge from submit-queue

bootstrap: Start hostNetwork pods even if network plugin not ready
2016-10-24 01:14:06 -07:00
Jan Chaloupka
4fde09d308 Replace client with clientset in code 2016-10-23 22:00:35 +02:00
Justin Santa Barbara
6465742da1 Update bringup: don't pass in dummy pod-cidr
We no longer pass in a "dummy" pod-cidr (10.123.45.0/29), and rely on
reconcile-cidr=true instead (which is the default).
2016-10-22 11:16:19 -04:00
Ritesh H Shukla
14cd178076 vSphere Kube-up: resolve vm-names on all nodes.
vm-names are used for vSphere cloud provider and they need to
resolution for log collection to work.
2016-10-22 09:36:06 +00:00