973fa6b334
Merge pull request #35821 from vishh/gci-mounter-scope
...
Automatic merge from submit-queue
[Kubelet] Use the custom mounter script for Nfs and Glusterfs only
This patch reduces the scope for the containerized mounter to NFS and GlusterFS on GCE + GCI clusters
This patch also enabled the containerized mounter on GCI nodes
Shepherding multiple PRs through the submit queue is painful. Hence I combined them into this PR. Please review each commit individually.
cc @jingxu97 @saad-ali
https://github.com/kubernetes/kubernetes/pull/35652 has also been reverted as part of this PR
2016-11-03 04:32:19 -07:00
db68b906e1
Merge pull request #35877 from mtaufen/bump-gci-56
...
Automatic merge from submit-queue
Bump GCI version to gci-dev-56-8938-0-0 for k8s v1.5
2016-11-03 03:21:03 -07:00
606a2dd020
Merge pull request #36090 from wojtek-t/fix_migration_collisions
...
Automatic merge from submit-queue
Fix collisions between different etcds during migration.
Ref #20504
2016-11-03 02:47:03 -07:00
40fc804831
Enable containerized storage plugins mounter on GCI
...
This reverts commit 765f7b9406
2016-11-02 15:18:09 -07:00
e5c61922f8
In gci mounter script, expose /var/lib/kubelet only and add more debugging logs.
...
Added a retry for rkt gc just to be safe.
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2016-11-02 15:18:09 -07:00
c15b9470f5
Replace apps/v1alpha1 with apps/v1beta1 and manually remove generated apps/v1alpha1 files
...
Manually remove generated apps/v1alpha1 types, protobuf, and api-reference doc files
Manually remove apps/v1alpha1 folder from 1.5 generated client
2016-11-02 15:16:23 -07:00
5b0389948f
Fix collisions between different etcds during migration.
2016-11-02 21:48:26 +01:00
09a42622d4
Merge pull request #35896 from wojtek-t/target_version
...
Automatic merge from submit-queue
Expose etcd version.
Ref #20504
This PRs makes use of the following two env variables
- ETCD_IMAGE (if set) allows to use a custom etcd image.
- ETCD_VERSION (if set) allows you to use custom version of etcd. The main purpose of using it may be rollback of etcd v3 API, where we need 3.0.* image, but are rolling back to 2.3.7.
2016-11-02 12:13:46 -07:00
2bbc80140a
Merge pull request #36062 from wojtek-t/etcd_migration_logs
...
Automatic merge from submit-queue
Extend etcd migration logs
Ref #20504
2016-11-02 09:21:23 -07:00
c2248324c1
Expose etcd version.
2016-11-02 17:03:13 +01:00
dc6571a5b2
Extend etcd migration logs
2016-11-02 13:59:34 +01:00
94a6538288
Merge pull request #35784 from wojtek-t/tweak_restore_script
...
Automatic merge from submit-queue
Support events in restore script
Ref #20504
2016-11-02 03:08:05 -07:00
f4c2a05eea
Merge pull request #33656 from koep/typos
...
Fix typos
2016-11-02 07:25:16 +01:00
030c74623d
Merge pull request #35764 from xilabao/break-endless-loop
...
Automatic merge from submit-queue
break endless loop in vagrant cluster
reference to [vagrant.md](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/local-cluster/vagrant.md ) troubleshooting , I guess we could set a time to return from endless loop to register with cloud provider.
2016-10-31 23:54:09 -07:00
482475e378
Merge pull request #35813 from mtaufen/bump-rkt-stage1-fly
...
Automatic merge from submit-queue
Bump rkt stage1-fly to 1.18.0
Bumps stage1-fly version.
2016-10-31 16:14:44 -07:00
7a6d26bab7
Bump rkt stage1-fly to 1.18.0
2016-10-31 14:54:39 -07:00
cc1d8951a9
Fix typos and linted_packages sorting
2016-10-31 18:31:08 +01:00
cda55a7847
Merge pull request #35783 from wojtek-t/support_rollback
...
Automatic merge from submit-queue
Better logging and support for running non-default version from etcd image
Ref #20504
2016-10-31 04:06:52 -07:00
62299921b5
Correctly support custom etcd migration
2016-10-31 09:03:39 +01:00
7fe1e06f07
Support events in restore script
2016-10-31 08:17:50 +01:00
2e8718fb9e
Bump GCI version to gci-dev-56-8938-0-0 for k8s v1.5
2016-10-30 11:14:42 -07:00
569da52204
Merge pull request #35708 from wojtek-t/rename_test_etcd_version
...
Automatic merge from submit-queue
Rename TEST_ETCD_VERSION to ETCD_VERSION
Ref #20504
2016-10-29 05:46:51 -07:00
bb992150fa
Merge pull request #35694 from wojtek-t/update_etcd_3_0_13
...
Automatic merge from submit-queue
Update Godeps etcd to 3.0.13
Ref #20504
2016-10-29 05:00:55 -07:00
9b021a97c7
Merge pull request #35319 from vishh/gci-startup
...
Automatic merge from submit-queue
On GCI, cleanup kubelet startup
-->
```release-note
* Avoid overriding system and kubelet cgroups on GCI
* Make the kubectl from k8s release the default on GCI
```
cc @kubernetes/sig-node @mtaufen
2016-10-29 00:36:06 -07:00
beda882dce
Merge pull request #35819 from vishh/gci-mounter-update
...
Automatic merge from submit-queue
Add netbase package to gci mounter container image
cc @rootfs @jingxu97
2016-10-28 20:45:16 -07:00
b29115658f
Bump GCE debian image to container-vm-v20161025 (CVE-2016-5195 (Dirty COW))
2016-10-28 14:23:49 -07:00
90053e34e2
Add netbase package to gci mounter container image
...
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2016-10-28 14:10:07 -07:00
7ee7b55c5e
Rename TEST_ETCD_VERSION to ETCD_VERSION
2016-10-28 13:56:59 +02:00
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
9a7c793df6
break endless loop in cluser/vagrant/util.sh
2016-10-28 14:42:07 +08:00
765f7b9406
Revert "Enable containerized storage plugins mounter on GCI"
2016-10-28 08:41:43 +02:00
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
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
10aee82ae3
Rename PetSet API to StatefulSet
2016-10-27 17:25:10 -07:00
f6f4f91ae7
On GCI, remove kubelet cgroup overrides and override host kubectl with that of the release
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 17:20:11 -07:00
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
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
c449ef8a25
Added CHANGELOG to addon manager
2016-10-27 12:31:19 -07:00
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
aceddfa7fc
Enable containerized storage mounter on GCI
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 11:56:34 -07:00
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
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
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
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
19c19c2e0f
Updating GCI mounter to be containerized
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-10-27 09:37:08 -07:00
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
543c2c20ac
Update etcd in tests to 3.0.13
2016-10-27 15:06:08 +02:00
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
44e66a97f3
Fix migration script
2016-10-27 10:17:56 +02:00
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