Commit Graph

34880 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
7dfbd8f8db Merge pull request #31942 from smarterclayton/debug_conversion
Automatic merge from submit-queue

Make it easier to debug conversion mismatches

@thockin made finding mismatches easier
2016-09-04 00:01:34 -07:00
Kubernetes Submit Queue
cbfd645b9c Merge pull request #31682 from xingzhou/km_bug
Automatic merge from submit-queue

Removed unused imports from mesos contrib.

Removed the unused imports from the "main.go"s.

Fixes #31681
2016-09-03 23:24:49 -07:00
Kubernetes Submit Queue
7bab34c3e9 Merge pull request #31998 from mwielgus/ca-0.3.0-b6
Automatic merge from submit-queue

Bump ClusterAutoscaler to 0.3.0-beta6

Contains https://github.com/kubernetes/contrib/pull/1685.
2016-09-03 22:47:03 -07:00
Jeff Lowdermilk
3d4b3d5e24 Merge pull request #32042 from kubernetes/revert-31957-sj_e2e_gke
Revert "Check server version when running scheduled job e2e tests"
2016-09-03 21:29:00 -07:00
Jeff Lowdermilk
cb487307dc Revert "Check server version when running scheduled job e2e tests" 2016-09-03 20:05:45 -07:00
Kubernetes Submit Queue
768e83657d Merge pull request #31922 from yujuhong/test_asserts
Automatic merge from submit-queue

kubelet_test.go: use assertions

Switch most of the tests in this file to using  the assert library
(`github.com/stretchr/testify/assert`) in the tests for better readability and
less code in general.
2016-09-03 09:51:36 -07:00
Kubernetes Submit Queue
d022750ad2 Merge pull request #31919 from ciwang/designdoc
Automatic merge from submit-queue

Snapshotting design doc

<!--  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**:

Design doc for volume snapshotting feature (alpha)

**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
```
2016-09-03 09:11:19 -07:00
Kubernetes Submit Queue
8730514bd2 Merge pull request #31861 from YuPengZTE/devNote
Automatic merge from submit-queue

The first letter is small

<!--  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**:

**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
```
2016-09-03 09:11:15 -07:00
Kubernetes Submit Queue
bbc6f45e03 Merge pull request #31957 from soltysh/sj_e2e_gke
Automatic merge from submit-queue

Check server version when running scheduled job e2e tests

@janetkuo this is the promised followup to #30575 which is checking minimal server version when running ScheduledJob e2e's.
2016-09-03 09:11:10 -07:00
Kubernetes Submit Queue
af9afbff87 Merge pull request #31970 from wojtek-t/configurable_qps_limits_in_tests
Automatic merge from submit-queue

Make it possible to set test args
2016-09-03 08:36:55 -07:00
Kubernetes Submit Queue
1f70140c4f Merge pull request #32021 from mikedanese/flake
Automatic merge from submit-queue

retry oauth token fetch in gce cloudprovider

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

The oauth client fetches a token on the initial request of that client. Let's warm the cache.

cc @goltermann @lavalamp
2016-09-03 01:58:19 -07:00
Kubernetes Submit Queue
3d80709dc5 Merge pull request #31904 from jianhuiz/federation-replicaset-controller-e2e
Automatic merge from submit-queue

update e2e test for federation replicaset controlelr

e2e test to verify replicases synced to underlying clusters.

@quinton-hoole @nikhiljindal @deepak-vij @kshafiee @mwielgus
2016-09-03 00:08:10 -07:00
Kubernetes Submit Queue
a8e96f73f2 Merge pull request #31980 from wongma7/pvc-genclient-copy
Automatic merge from submit-queue

Run copy.sh to update client-go for pvcs

Following up https://github.com/kubernetes/kubernetes/pull/31834 to copy the changes to client-go

Ought to be v1.4, only touches client-go. (same reasoning as here: https://github.com/kubernetes/kubernetes/pull/31644#issuecomment-243274461)
2016-09-02 23:26:52 -07:00
Kubernetes Submit Queue
da0e565fa7 Merge pull request #31934 from timstclair/aa-psp
Automatic merge from submit-queue

Fix PSP update validation

Issues fixed:
- apparmor annotations were not being validated
- sysctl annotations were not being validated
- `ValidateObjectMetaUpdate` parameters were reversed

/cc @sttts 

---

1.4 justification:

- Risk: If I did something wrong, valid updates could be rejected or invalid updates accepted.
- Rollback: Nothing should depend on this behavior
- Cost: As it stands, the PSP can be updated to an invalid state. The cost of this is relatively low, but a bad user experience.
2016-09-02 22:42:01 -07:00
Kubernetes Submit Queue
f47707129c Merge pull request #31927 from timstclair/psp
Automatic merge from submit-queue

Fix PSP volumes error message

Was:
```
Error from server: error when creating "pause-pod.yaml": pods "pause" is forbidden: unable to validate against any pod security policy: [spec.containers[0].securityContext.volumes[0]: Invalid value: "secret": secret volumes are not allowed to be used]
```
Now:
```
Error from server: error when creating "pause-pod.yaml": pods "pause" is forbidden: unable to validate against any pod security policy: [spec.volumes[0]: Invalid value: "secret": secret volumes are not allowed to be used]
```

Also, only perform the validation once (by moving it from `ValidateContainerSecurityContext` to `ValidatePodSecurityContext`).

---

1.4 Justification:

- Risk: low, this is just altering an error message
- Rollback: nothing should depend on this functionality
- Cost: the old error message didn't make any sense (there are no volumes on a container SecurityContext). This is fixing a bug.
2016-09-02 22:04:16 -07:00
Kubernetes Submit Queue
4414882543 Merge pull request #31895 from ymqytw/better_error_message
Automatic merge from submit-queue

Return detailed error message for better debugging.

Try to provide more details error message for debugging when this flake #31561 happens again.
@pwittrock
2016-09-02 21:26:59 -07:00
Kubernetes Submit Queue
c4a2baa29a Merge pull request #31532 from wongma7/pv-gid-e2e-on
Automatic merge from submit-queue

Bump nfs server image tag in pv e2e

Image modified in https://github.com/kubernetes/kubernetes/pull/30084 has been pushed, so we can bump this back up to enable the part where pod writes to server with restrictive permissions
2016-09-02 20:47:41 -07:00
Kubernetes Submit Queue
4968f1006e Merge pull request #32015 from smarterclayton/add_more_debugging
Automatic merge from submit-queue

Print out some extra details from the namespace deletion error

Adds debugging for #32009.  Only adds test code.
2016-09-02 20:09:54 -07:00
Kubernetes Submit Queue
3cd6311efb Merge pull request #28120 from vefimova/fix_22986-2
Automatic merge from submit-queue

Added printing of clarification for `object creation` request in case of object is in the process of graceful deletion

## **Output example:**
### # kubectl create -f ./pod.yaml
`pod "test-pod" created`
### # kubectl create -f ./pod.yaml
`Error from server: error when creating "../simplePod.yaml": pods "test-pod" already exists`
### # kubectl delete pods/test-pod
`pod "test-pod" deleted`
### # kubectl create -f ./pod.yaml
`Error from server: error when creating "../simplePod.yaml": object is being deleted: pods "test-pod" already exists`
2016-09-02 20:09:49 -07:00
Kubernetes Submit Queue
ac7fbf502a Merge pull request #31925 from nikhiljindal/freshDebugNs
Automatic merge from submit-queue

Adding namespaces/finalizer subresource to federation apiserver

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

cc @kubernetes/sig-cluster-federation @mwielgus 


Verified manually that I can delete federation namespaces now.
Will update federation-namespace e2e test to verify that namespace is deleted fine
2016-09-02 19:30:25 -07:00
Kubernetes Submit Queue
d22f04186c Merge pull request #32002 from mikedanese/spammy
Automatic merge from submit-queue

lower loglevel of spammy warning

this get's hit all the time on non containervm systems (e.g. anything with new udev where default ethernet device got renamed to enp0s01247uo83249 because that's more user friendly.)

I'm seeing my logs filed with this.
```
Sep 02 20:31:40 instance-1 kubelet-wrapper[7152]: W0902 20:31:40.234051    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:31:50 instance-1 kubelet-wrapper[7152]: W0902 20:31:50.269382    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:32:00 instance-1 kubelet-wrapper[7152]: W0902 20:32:00.304785    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:32:10 instance-1 kubelet-wrapper[7152]: W0902 20:32:10.329420    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:32:20 instance-1 kubelet-wrapper[7152]: W0902 20:32:20.363680    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:32:30 instance-1 kubelet-wrapper[7152]: W0902 20:32:30.402619    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:32:40 instance-1 kubelet-wrapper[7152]: W0902 20:32:40.429717    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:32:50 instance-1 kubelet-wrapper[7152]: W0902 20:32:50.459636    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:33:00 instance-1 kubelet-wrapper[7152]: W0902 20:33:00.484305    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:33:10 instance-1 kubelet-wrapper[7152]: W0902 20:33:10.528655    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:33:20 instance-1 kubelet-wrapper[7152]: W0902 20:33:20.564380    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:33:30 instance-1 kubelet-wrapper[7152]: W0902 20:33:30.589506    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:33:40 instance-1 kubelet-wrapper[7152]: W0902 20:33:40.618750    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:33:50 instance-1 kubelet-wrapper[7152]: W0902 20:33:50.643367    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:34:00 instance-1 kubelet-wrapper[7152]: W0902 20:34:00.678746    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:34:10 instance-1 kubelet-wrapper[7152]: W0902 20:34:10.712398    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:34:20 instance-1 kubelet-wrapper[7152]: W0902 20:34:20.738242    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:34:30 instance-1 kubelet-wrapper[7152]: W0902 20:34:30.764254    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:34:40 instance-1 kubelet-wrapper[7152]: W0902 20:34:40.789706    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:34:50 instance-1 kubelet-wrapper[7152]: W0902 20:34:50.822828    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:35:00 instance-1 kubelet-wrapper[7152]: W0902 20:35:00.857558    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:35:10 instance-1 kubelet-wrapper[7152]: W0902 20:35:10.893635    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:35:20 instance-1 kubelet-wrapper[7152]: W0902 20:35:20.920920    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:35:30 instance-1 kubelet-wrapper[7152]: W0902 20:35:30.955334    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:35:40 instance-1 kubelet-wrapper[7152]: W0902 20:35:40.988821    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:35:51 instance-1 kubelet-wrapper[7152]: W0902 20:35:51.027433    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:36:01 instance-1 kubelet-wrapper[7152]: W0902 20:36:01.065433    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:36:11 instance-1 kubelet-wrapper[7152]: W0902 20:36:11.104807    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:36:21 instance-1 kubelet-wrapper[7152]: W0902 20:36:21.137300    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:36:31 instance-1 kubelet-wrapper[7152]: W0902 20:36:31.170241    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:36:41 instance-1 kubelet-wrapper[7152]: W0902 20:36:41.205549    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:36:51 instance-1 kubelet-wrapper[7152]: W0902 20:36:51.246228    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:37:01 instance-1 kubelet-wrapper[7152]: W0902 20:37:01.283743    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:37:11 instance-1 kubelet-wrapper[7152]: W0902 20:37:11.322205    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
Sep 02 20:37:21 instance-1 kubelet-wrapper[7152]: W0902 20:37:21.358846    7155 summary.go:352] Missing default interface "eth0" for node:instance-1
```
2016-09-02 18:51:10 -07:00
Kubernetes Submit Queue
1e21eda604 Merge pull request #31197 from freehan/kubenethairpin
Automatic merge from submit-queue

Deprecate the old cbr0 and flannel networking modes

fixes: #19766
2016-09-02 18:51:05 -07:00
Mike Danese
1a3ff0788b retry oauth token fetch in gce cloudprovider
The ouath client fetches a token on it's first request. Let's warm
the cache to avoid pesky flakes.
2016-09-02 18:20:10 -07:00
Kubernetes Submit Queue
0e5b777ded Merge pull request #32007 from caesarxuchao/gc-retry
Automatic merge from submit-queue

[GarbageCollector] GC retries failed garbage collection

The code was buried in #30483, which we decided to put off to 1.5.
2016-09-02 18:13:18 -07:00
Kubernetes Submit Queue
e358b8e6e2 Merge pull request #32016 from Random-Liu/fix-node-problem-detector-test-flake
Automatic merge from submit-queue

Node Problem Detector: Use the right waiting time for eventually in NPD node e2e

Fixes https://github.com/kubernetes/kubernetes/issues/29656.
The `Eventually` check changed in this PR is used to make sure NPD generating default node condition after it starts. Mostly it should happen very fast, but sometimes it may take some time.

In the test, we should use `pollTimeout`(`1m`) for eventually check which is long enough, but we used `pollConsistent`(`5s`) by mistake.

This PR changed the eventually check to use `pollTimeout`(`1m`).

Mark P1 to match the corresponding test flake.

/cc @krousey @pwittrock
2016-09-02 17:35:32 -07:00
Kubernetes Submit Queue
ffc12b349f Merge pull request #32000 from pmorie/node-update-status
Automatic merge from submit-queue

Update node status instead of node in kubelet

#31730 added code for the Kubelet to reconcile the existing and new nodes in order to annotate existing nodes with the annotation for controller-managed attach-detach.  However, it used `Update` instead of `UpdateStatus`, which changes the operations the node's token needs to be permitted to use.  Using `UpdateStatus` is functionally equivalent and maintains the same set of permissions nodes need to have today.

I'm adding this with the 1.4 milestone because it is a follow-on to a 1.4 PR and fixes a downstream bug (which won't surface to Kube).
2016-09-02 16:56:14 -07:00
Kubernetes Submit Queue
130051b2d9 Merge pull request #31090 from justinsb/fix_29324
Automatic merge from submit-queue

AWS: fix volume device assignment race condition

* Move volume attachment map to cloud level
* Perform sanity check after volume attach, to double-check everything is right
2016-09-02 16:19:57 -07:00
Random-Liu
27779425e3 Use the right waiting time for eventually. 2016-09-02 16:01:53 -07:00
Clayton Coleman
e3b0c35ca2 Print out some extra details from the namespace deletion error 2016-09-02 19:00:54 -04:00
Kubernetes Submit Queue
83035a52ce Merge pull request #32005 from vishh/fix-e2e-node-logs
Automatic merge from submit-queue

Increase logging level for e2e node services

Without this change, the apiserver logs are non existent for node e2e tests.
2016-09-02 15:44:11 -07:00
nikhiljindal
556fa932dd Updated federation swagger spec 2016-09-02 15:30:33 -07:00
nikhiljindal
a51d79110c Update the namespace test to verify that namespace was deleted as expected 2016-09-02 15:30:33 -07:00
nikhiljindal
274487da87 Adding namespaces/finalizer subresource to federation apiserver 2016-09-02 15:30:32 -07:00
Kubernetes Submit Queue
11765ab92e Merge pull request #31887 from liggitt/certificates-group
Automatic merge from submit-queue

Namespace certificates API group

New API groups should follow best-practices for naming, including using DNS names within the k8s.io namespace

```release-note
The certificates API group has been renamed to certificates.k8s.io
```
2016-09-02 15:08:55 -07:00
Minhan Xia
83ca3504b4 add deprecate message for configure-cbr0 2016-09-02 14:36:07 -07:00
Minhan Xia
1a484d5585 bump debian-iptables version 2016-09-02 14:34:29 -07:00
Minhan Xia
fd4c947de9 correct typo in kubenet config 2016-09-02 14:33:34 -07:00
Kubernetes Submit Queue
be290b5904 Merge pull request #31931 from freehan/kubenetcheck
Automatic merge from submit-queue

kubenet checks required cni plugins are present

related to #31215
2016-09-02 14:32:08 -07:00
Chao Xu
25966e1148 gc retries failed garbage collection 2016-09-02 14:17:42 -07:00
Vishnu kannan
59e14cf55b Increase logging level for e2e node services
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-09-02 14:05:09 -07:00
Kubernetes Submit Queue
c337778803 Merge pull request #31356 from jfrazelle/29227-fix-e2e-http-request-flake
Automatic merge from submit-queue

test/e2e: fix flake in kubelet expose should create services for rc

<!--  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**:

**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
NONE
```

Add a loop to retry the request to account for the TLS Timeout and API
credential error responses outlined by the flakes in #29227.

Fixes #29227
2016-09-02 13:55:52 -07:00
Cindy Wang
3a28c09efb Snapshotting design doc
minor edits, changing prefix on annotations

update-munge-docs
2016-09-02 13:39:50 -07:00
Mike Danese
39d190e983 lower loglevel of spammy warning 2016-09-02 13:34:29 -07:00
Paul Morie
67387632dc Update node status instead of node in kubelet 2016-09-02 16:24:39 -04:00
jianhuiz
a2e6542e2a update e2e test for federation replicaset controlelr 2016-09-02 13:18:46 -07:00
Kubernetes Submit Queue
0cdaf1028e Merge pull request #31912 from mtaufen/eviction-aftereach
Automatic merge from submit-queue

Move wait for pressure to subside to AfterEach 

so we still wait if the test part of the test for eviction order fails.
2016-09-02 13:15:36 -07:00
Marcin Wielgus
5d3adbe552 Bump ClusterAutoscaler to 0.3.0-beta6 2016-09-02 22:15:35 +02:00
Kubernetes Submit Queue
27bd087eff Merge pull request #31982 from coufon/increase_resource_limit
Automatic merge from submit-queue

increase resource usage limit in node e2e test

This PR increases the resource limit of node e2e density test according to previous measurements.

Fixed https://github.com/kubernetes/kubernetes/issues/31877 and fixed https://github.com/kubernetes/kubernetes/issues/30523
2016-09-02 12:31:47 -07:00
Kubernetes Submit Queue
06c542b4c0 Merge pull request #31985 from smarterclayton/register_delete_options
Automatic merge from submit-queue

Internal types must be registered in their group version
2016-09-02 11:54:29 -07:00
Kubernetes Submit Queue
c8525ec99a Merge pull request #31642 from jfrazelle/fix-upgrade-e2e-gke-1.3-1.4-kubectl-skew
Automatic merge from submit-queue

fixes upgrade tests for kubectl skew from 1.3 to master

<!--  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**:

**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
```

This PR modified the output from "QoS Tier" to "QoS Class" which broke the kubectl skew upgrade test from 1.3 to 1.4 https://github.com/kubernetes/kubernetes/pull/27749

this fixes that
2016-09-02 11:19:14 -07:00