Commit Graph

37613 Commits (ed60ee407299cd98603eb7718e8cd95a514cb819)

Author SHA1 Message Date
Kubernetes Submit Queue ed60ee4072 Merge pull request #34705 from humblec/gluster-pvc-namespace-1
Automatic merge from submit-queue

Makeuse of PVC namespace when provisioning gluster volumes.

Depends on https://github.com/kubernetes/kubernetes/pull/34611
2016-10-20 01:28:31 -07:00
Kubernetes Submit Queue d7e70bd448 Merge pull request #35085 from xilabao/fix-testing-against-local-clusters
Automatic merge from submit-queue

check_node_count falls out of use, clear from docs/devel/e2e-tests.md

delete "--check_node_count " for testing against local clusters
2016-10-20 00:08:05 -07:00
Kubernetes Submit Queue 333c045429 Merge pull request #34998 from timstclair/sysdisk
Automatic merge from submit-queue

Don't report FS stats for system containers in the Kubelet Summary API

Fixes https://github.com/kubernetes/kubernetes/issues/31999
2016-10-20 00:07:56 -07:00
Kubernetes Submit Queue 0b2674eac7 Merge pull request #34389 from guangxuli/k8s_configmap_test
Automatic merge from submit-queue

add a clean code for TestCanSupport
2016-10-19 23:26:28 -07:00
Kubernetes Submit Queue b559cc3200 Merge pull request #35158 from foxish/petset-redis-fix
Automatic merge from submit-queue

Fixing flakes caused by petset tests.

**What this PR does / why we need it**: We should wait till the key/value has been replicated to database slaves before trying to read from them.

**Which issue this PR fixes** Fixes https://github.com/kubernetes/kubernetes/issues/33904, https://github.com/kubernetes/kubernetes/issues/33895

cc @kubernetes/sig-apps
2016-10-19 22:41:59 -07:00
Kubernetes Submit Queue 3e22b38f70 Merge pull request #34653 from rata/simplify-e2e-secret
Automatic merge from submit-queue

Add secret e2e test for keys mapping

**What this PR does / why we need it**: Adds a basic e2e test missing in secrets

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

**Release note**:
```NONE
```
This patch adds a secret e2e test. While configmap e2e tests are far
more complete, this patch makes secret e2e tests one step closer.

Also, now is more easy to add more tests without code duplication (as I
did in earlier patches :-/), because of the functions created, and is
more easy to make it similar to confimap e2e in the future, that is
really complete.
2016-10-19 21:58:31 -07:00
Kubernetes Submit Queue 41c9bbcc02 Merge pull request #34514 from derekwaynecarr/validation-fixes
Automatic merge from submit-queue

requests.storage is a standard resource name

The value `requests.storage` is a valid standard resource name but was omitted from the standard list.
2016-10-19 21:16:35 -07:00
Kubernetes Submit Queue 5fcb9fd056 Merge pull request #35125 from wojtek-t/avoid_unnecessary_reallocations
Automatic merge from submit-queue

Avoid unnecessary reallocations of slice in Cacher
2016-10-19 20:33:13 -07:00
Anirudh bbc282c5b8 fixing lint. 2016-10-19 20:21:01 -07:00
Kubernetes Submit Queue 6306ab00d2 Merge pull request #34845 from derekwaynecarr/make_pvc_informer_list
Automatic merge from submit-queue

PVC informer lister supports listing

This will be used in follow-on PRs for quota evaluation backed by informers for pvcs.

/cc @deads2k @eparis @kubernetes/sig-storage
2016-10-19 19:29:02 -07:00
Anirudh eeeffbb183 Fixed based on comments 2016-10-19 18:50:34 -07:00
Kubernetes Submit Queue deadea91dc Merge pull request #35142 from dankohn/dankohn-code-of-conduct
Automatic merge from submit-queue

Change code of conduct to call CNCF CoC by reference

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

Revises the Kubernetes Code of Conduct (CoC) to point to the CNCF CoC by reference. The CNCF CoC is nearly identical to the Kubernetes one. The only changes are replacing `Kubernetes` with `CNCF` and referencing the Linux Foundation events CoC.

Here is an exact diff of the changes between the Kubernetes CoC and the CNCF CoC: 9f3936e486

Note that this PR attempts to resolve https://github.com/cncf/foundation/issues/2 which is to have a standard CoC for all CNCF projects.

**Special notes for your reviewer**:

Cc @sarahnovotny @bgrant0607 @aronchick @caniszczyk @monadic
2016-10-19 18:11:19 -07:00
Kubernetes Submit Queue a9192ff473 Merge pull request #34831 from dcbw/multizone-gce-instances
Automatic merge from submit-queue

cloudprovider/gce: canonicalize instance name when returning instance array

'names' is an array of FQDNs.  'instances' is a map indexed by canonicalized
name.  Clearly these two won't always match, so when building the final
instance array to return, make sure to look up map entries by their canonicalized
name.

In the below example, "ocp-master-5pob" is clearly found as a GCE instance
but when building the final instance array it cannot be matched as the code
is looking for "ocp-master-5pob.c.ose-refarch.internal" instead.  The node
is then deleted from the cluster as it cannot be found by the cloud provider.

```
gce.go:2519] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): initial node prefix ocp-
gce.go:2530] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): looking for instances map[ocp-master-5pob:<nil>]
gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-c' (remaining 1)
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-b' (remaining 1)
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2576] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    found instance 'ocp-master-5pob' remaining 0
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-d' (remaining 0)
gce.go:2588] Failed to retrieve instance: "ocp-master-5pob.c.ose-refarch.internal"
gce.go:2624] ### getInstanceByName(ocp-master-5pob.c.ose-refarch.internal): got []: instance not found
gce.go:2626] getInstanceByName/multiple-zones: failed to get instance ocp-master-5pob.c.ose-refarch.internal; err: instance not found
nodecontroller.go:587] Deleting node (no longer present in cloud provider): ocp-master-5pob.c.ose-refarch.internal
nodecontroller.go:664] Recording Deleting Node ocp-master-5pob.c.ose-refarch.internal because it's not present according to cloud provider event message for node ocp-master-5pob.c.ose-refarch.internal
```
2016-10-19 18:11:10 -07:00
Anirudh 38a6f38c6d Fixing flake caused by lack of polling during read. 2016-10-19 17:32:05 -07:00
Kubernetes Submit Queue 7007064e1e Merge pull request #35160 from mml/luc-cleanup
Automatic merge from submit-queue

Remove unneeded double quotes from hack/local-up-cluster.sh.
2016-10-19 17:29:12 -07:00
Kubernetes Submit Queue 561ae5054a Merge pull request #35152 from jessfraz/changelog-fix
Automatic merge from submit-queue

changelog: readd downloads section

ping @david-mcmahon
2016-10-19 17:29:02 -07:00
Kubernetes Submit Queue f8999a0efd Merge pull request #35141 from rootfs/rbd-secret2
Automatic merge from submit-queue

remove pv annotation from rbd volume

@kubernetes/sig-storage  @jsafrane @childsb @eparis
2016-10-19 17:28:52 -07:00
Matt Liggett 1decca8202 Remove unneeded double quotes from hack/local-up-cluster.sh.
They freak out vim syntax highlighting when they are combined with a '/'
character.
2016-10-19 15:12:11 -07:00
Kubernetes Submit Queue 192e18e2bb Merge pull request #35148 from caesarxuchao/importboss-clientset
Automatic merge from submit-queue

Add import restriction to clientset

This prevents clientset from import more packages in pkg/client/unversioned, because we want to deprecate pkg/client/unversioned.

cc @ingvagabund
2016-10-19 14:01:19 -07:00
Kubernetes Submit Queue a2460ad308 Merge pull request #35082 from mml/disruption-wait
Automatic merge from submit-queue

Wait for all pods to be running before checking PDB status.
2016-10-19 14:01:09 -07:00
Kubernetes Submit Queue 2de1f5c07e Merge pull request #34407 from brendandburns/kubectl-schema
Automatic merge from submit-queue

Add validation that detects repeated keys in the labels and annotations maps

Fixes #2965  (a nearly 2 year old feature request!)

@kubernetes/kubectl 

@eparis
2016-10-19 14:01:00 -07:00
Jess Frazelle dcf7331a1d
changelog: readd downloads section
Signed-off-by: Jess Frazelle <acidburn@google.com>
2016-10-19 13:24:37 -07:00
derekwaynecarr d5c45e8892 requests.storage is a standard resource name 2016-10-19 15:54:08 -04:00
Kubernetes Submit Queue cb03ed36bd Merge pull request #35029 from wojtek-t/avoid_computing_keys_multiple_times
Automatic merge from submit-queue

Avoid computing keys multiple times in Cacher

This should significantly reduce both cpu-usage and number of allocations in Cacher.

This is a proper follow-up from #30998

@deads2k @liggitt
2016-10-19 12:19:37 -07:00
Humble Chirammal 0d080f986d Use PVC namespace when provisioning GlusterFS volumes.
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
2016-10-20 00:31:21 +05:30
Chao Xu 45432750df add import restriction to clientset 2016-10-19 11:47:51 -07:00
Kubernetes Submit Queue 91b7e1f9c3 Merge pull request #34638 from screeley44/k8-get-sc
Automatic merge from submit-queue

Adding default StorageClass annotation printout for resource_printer and describer and some refactoring

adding ISDEFAULT for _kubectl get storageclass_ output

```
[root@screeley-sc1 gce]# kubectl get storageclass
NAME            TYPE                   ISDEFAULT
another-class   kubernetes.io/gce-pd   NO        
generic1-slow   kubernetes.io/gce-pd   YES       
generic2-fast   kubernetes.io/gce-pd   YES       
```

```release-note
Add ISDEFAULT to kubectl get storageClass output
```

@kubernetes/sig-storage
2016-10-19 11:36:08 -07:00
Dan Williams 40cefcaf8f cloudprovider/gce: canonicalize instance name when returning instance array
'names' is an array of FQDNs.  'instances' is a map indexed by canonicalized
name.  Clearly these two won't always match, so when building the final
instance array to return, make sure to look up map entries by their canonicalized
name.

In the below example, "ocp-master-5pob" is clearly found as a GCE instance
but when building the final instance array it cannot be matched as the code
is looking for "ocp-master-5pob.c.ose-refarch.internal" instead.  The node
is then deleted from the cluster as it cannot be found by the cloud provider.

gce.go:2519] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): initial node prefix ocp-
gce.go:2530] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): looking for instances map[ocp-master-5pob:<nil>]
gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-c' (remaining 1)
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-b' (remaining 1)
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2576] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    found instance 'ocp-master-5pob' remaining 0
gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]):    instance name <omitted> not requested
gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-d' (remaining 0)
gce.go:2588] Failed to retrieve instance: "ocp-master-5pob.c.ose-refarch.internal"
gce.go:2624] ### getInstanceByName(ocp-master-5pob.c.ose-refarch.internal): got []: instance not found
gce.go:2626] getInstanceByName/multiple-zones: failed to get instance ocp-master-5pob.c.ose-refarch.internal; err: instance not found
nodecontroller.go:587] Deleting node (no longer present in cloud provider): ocp-master-5pob.c.ose-refarch.internal
nodecontroller.go:664] Recording Deleting Node ocp-master-5pob.c.ose-refarch.internal because it's not present according to cloud provider event message for node ocp-master-5pob.c.ose-refarch.internal
2016-10-19 13:03:58 -05:00
Wojciech Tyczynski 0ced3f43bf Avoid unnecessary reallocations of slice in Cacher 2016-10-19 19:33:33 +02:00
Huamin Chen 10b29de55c remove pv annotation from rbd volume
Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-10-19 13:30:33 -04:00
Dan Kohn 77db65d6bb Change code of conduct to call CNCF CoC by reference 2016-10-19 13:22:35 -04:00
Kubernetes Submit Queue 26aa5a9e2f Merge pull request #35122 from gmarek/clientset
Automatic merge from submit-queue

Use clientset in GetReadySchedulableNodesOrDie
2016-10-19 10:06:13 -07:00
Kubernetes Submit Queue 10a0d2a468 Merge pull request #35120 from eparis/hack-sort
Automatic merge from submit-queue

Use LC_ALL=C with sort

In some user env LANG=C might lose:

Wrong:
```
echo -e "test/images/port-forward-tester\ntest/images/porter" | LANG=C sort
test/images/porter
test/images/port-forward-tester
```
Right:
```
echo -e "test/images/port-forward-tester\ntest/images/porter" | LC_ALL=C sort
test/images/port-forward-tester
test/images/porter
```
2016-10-19 08:45:19 -07:00
Kubernetes Submit Queue d4087d0b73 Merge pull request #35022 from jsafrane/gluster-secrets2
Automatic merge from submit-queue

Remove PV annotations for Gluster provisioner.

Don't store Gluster SotrageClass parameters in annotations, it's insecure.
Instead, expect that there is the StorageClass available at the time
when it's needed by Gluster deleter.

See #34822 for detais

@kubernetes/sig-storage
2016-10-19 08:45:08 -07:00
Kubernetes Submit Queue 5133e1f0df Merge pull request #34683 from asalkeld/cmd/testing/fake
Automatic merge from submit-queue

Move the common test functions from cmd_test.go to cmd/testing/fake.go

**What this PR does / why we need it**:
This is so that we can use NewAPIFactory() from cmd/set/*test.go
Up until now we would get a import loop error.

This commit also adds a basic unit test case for cmd/set/set_image.go

**Which issue this PR fixes**
partial #34592

**Special notes for your reviewer**:
None

**Release note**:
```release-note
NONE
```
2016-10-19 08:03:07 -07:00
Scott Creeley 86f1a94be5 Adding default StorageClass annotation printout for resource_printer 2016-10-19 10:59:07 -04:00
gmarek f08f751831 Use clientset in GetReadySchedulableNodesOrDie 2016-10-19 15:55:39 +02:00
Eric Paris b670f76232 Use LC_ALL=C with sort
In some user env LANG=C might lose:

Wrong:
```
echo -e "test/images/port-forward-tester\ntest/images/porter" | LANG=C sort
test/images/porter
test/images/port-forward-tester
```
Right:
```
echo -e "test/images/port-forward-tester\ntest/images/porter" | LC_ALL=C sort
test/images/port-forward-tester
test/images/porter
```
2016-10-19 09:47:21 -04:00
Kubernetes Submit Queue be1996ee64 Merge pull request #35112 from errordeveloper/fix-35105
Automatic merge from submit-queue

Get rid of output line that break automated usage of `kubectl set image`

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

**Which issue this PR fixes**: fixes #35105

**Special notes for your reviewer**: We could consider printing it to stderr, or using `IsTerminal()`, but I went for the simplest thing first.

**Release note**:
```release-note
Make `kubectl set image` easier to script
```
2016-10-19 06:23:38 -07:00
Kubernetes Submit Queue 6b56d7baa2 Merge pull request #34976 from deads2k/api-30-separate-third-party
Automatic merge from submit-queue

separate third party resources from master (moves + consequences)

Remove the third party resource code from the main `Master` struct.  I think we may be able to get this down to particular way to configure/`New` a generic API server.
2016-10-19 06:23:29 -07:00
Kubernetes Submit Queue 8290366a8f Merge pull request #33966 from dims/fix-issue-33375
Automatic merge from submit-queue

Enable local-up-cluster.sh to start with the secured port

related to #33375
2016-10-19 05:40:32 -07:00
Ilya Dmitrichenko 2494462e5f
Get rid of output line that break automated usage of `kubectl set image` (fix #35105) 2016-10-19 13:13:20 +01:00
deads2k f9cbc42581 separate third party resources from master (moves + consequences) 2016-10-19 07:40:58 -04:00
Kubernetes Submit Queue cbe65701a2 Merge pull request #35104 from gmarek/root_disk
Automatic merge from submit-queue

Allow setting master root disk size in kubemark
2016-10-19 04:25:06 -07:00
Kubernetes Submit Queue bf0d323460 Merge pull request #35102 from gmarek/mount_disk
Automatic merge from submit-queue

Mount disk in kubemark earlier
2016-10-19 04:24:58 -07:00
Kubernetes Submit Queue 06c0416de4 Merge pull request #35034 from sttts/sttts-remove-srvrunoption-apigroupprefix
Automatic merge from submit-queue

Make APIGroupPrefix constant: "/apis"

It's not wired externally, so let's get rid of it and make it constant.
2016-10-19 04:24:49 -07:00
gmarek 16d8e6400e Allow setting master root disk size in kubemark 2016-10-19 12:37:17 +02:00
Davanum Srinivas 20d1818d78 Enable local-up-cluster.sh to start with the secured port
Generate a kubeconfig for use with controller-manager, kubelet,
scheduler etc. This kubeconfig should use the secure https
port of the api server with appropriate ca cert for the components
to talk to api server.

With this change, one can set API_PORT=0 to completely switch off
insecure access for testing admission controllers etc.

Fixes #33375
2016-10-19 06:36:01 -04:00
gmarek cde44bc07c Mount disk in kubemark earlier 2016-10-19 12:11:10 +02:00
Kubernetes Submit Queue e05ef8724f Merge pull request #35099 from gmarek/startpods
Automatic merge from submit-queue

Fix StartPods

Fix #34221
2016-10-19 03:09:51 -07:00