Commit Graph

30304 Commits

Author SHA1 Message Date
k8s-merge-robot
911e84ed1e Merge pull request #26710 from sttts/sttts-fix-seccomp-annotations
Automatic merge from submit-queue

Move /seccomp/ into domain prefix in seccomp annotations

Fixes #26610.

/cc @mdshuai @ncdc @jfrazelle
2016-06-11 07:03:50 -07:00
k8s-merge-robot
584d6a1f94 Merge pull request #26648 from Random-Liu/add_node_problem_detector_e2e_test
Automatic merge from submit-queue

Add e2e test for node problem detector

Based on https://github.com/kubernetes/node-problem-detector/pull/12.

This PR added e2e test for node problem detector. It starts a node problem detector with test configuration, and test its functionality.

Question:
* Should this be a node e2e test or e2e test? 
* Should we mark this as Serial? The test should not affect other tests, but it will add a `TestConditon` in node conditions and remove in cleanup.

@dchen1107
/cc @kubernetes/sig-node 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-11 06:21:40 -07:00
k8s-merge-robot
64da66bab4 Merge pull request #24983 from Arvinderpal/cni_args_ignoreunknown
Automatic merge from submit-queue

Sets IgnoreUnknown=1 in CNI_ARGS

```release-note
release-note-none
```

K8 uses CNI_ARGS to pass pod namespace, name and infra container
id to the CNI network plugin. CNI logic will throw an error
if these args are not known to it, unless the user specifies
IgnoreUnknown as part of CNI_ARGS. This PR sets IgnoreUnknown=1
to prevent the CNI logic from erroring and blocking pod setup.
https://github.com/appc/cni/pull/158
https://github.com/appc/cni/issues/126
2016-06-11 05:38:30 -07:00
k8s-merge-robot
a4b5f991e7 Merge pull request #27148 from janetkuo/io-timeout-sleep-and-talk
Automatic merge from submit-queue

In case of i/o timeout error in kubectl e2e, try talking to the server again after 2s before dying

Ref #26715

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-11 02:47:49 -07:00
k8s-merge-robot
f789a07619 Merge pull request #27200 from yifan-gu/errorout_empty_gid
Automatic merge from submit-queue

rkt: Error out when the gid is empty.

cc @kubernetes/rktnetes-maintainers 

Ref  https://github.com/appc/spec/issues/623
2016-06-11 02:05:35 -07:00
k8s-merge-robot
b9247598eb Merge pull request #27160 from janetkuo/illegal-deployment-strategy
Automatic merge from submit-queue

Validation for illegal deployment strategy

Fixes #23677

@kubernetes/deployment 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-11 00:12:51 -07:00
k8s-merge-robot
adb06748f7 Merge pull request #27158 from nikhiljindal/dnsProvider
Automatic merge from submit-queue

federation: Adding dnsprovider flags to federation-controller-manager
2016-06-10 23:28:41 -07:00
k8s-merge-robot
3cc43eb0d2 Merge pull request #27028 from mfanjie/fix_cluster_sync_loop
Automatic merge from submit-queue

federation service controller: fixing a bug so that existing services are created in newly registered clusters

A defect on federation service controller.
Steps to recreate:
1. boot federation control plane
2. create a service and then register a new cluster

Root cause:
the right sequence should be  
```
servicesToUpdate = s.serviceCache.allServices()
```
then
```
s.updateAllServicesToCluster(servicesToUpdate, newCluster) 
```
then
```
servicesToUpdate = s.updateDNSRecords(servicesToUpdate, newClusters)
```
Now the first two lines' sequence is on the contrary, so when updateDNSRecords return no error, the service will be removed from  servicesToUpdate, and updateAllServicesToCluster get nothing to update.

This PR make the call sequence correct.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-10 22:12:16 -07:00
k8s-merge-robot
ede661b4af Merge pull request #27012 from janetkuo/reduce-pod-list
Automatic merge from submit-queue

Listing pods only once when getting pods for RS in deployment

Fixes #26834

1. Avoid ranging over RSes and then `List` pods of each RS. Instead, `List` pods of the deployment once, and then filter pods of each RS. 
2. Avoid using clientset to `List` pods in deployment controller. Use podStore instead. (TODO in some functions because the unit tests don't have podStore.)

@kubernetes/deployment 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-10 20:40:22 -07:00
Yifan Gu
edc946e081 rkt: Error out when the gid is empty.
Since appc requires gid to be non-empty today (https://github.com/appc/spec/issues/623),
we have to error out when gid is empty instead of using the root gid.
2016-06-10 18:48:14 -07:00
Dawn Chen
507d7e5565 Merge pull request #27226 from kubernetes/revert-27222-revert-27217-server-version
Revert "Revert "e2e-runner.sh: don't overwrite readonly var""
2016-06-10 18:18:07 -07:00
Dawn Chen
f04d3ebdd2 Revert "Revert "e2e-runner.sh: don't overwrite readonly var"" 2016-06-10 18:17:51 -07:00
Dawn Chen
bf85ecda5e Merge pull request #27225 from kubernetes/revert-27223-revert-27215-gke-pinned
Revert "Revert "third time charm for #27144""
2016-06-10 18:17:38 -07:00
Dawn Chen
3b0fadf396 Revert "Revert "third time charm for #27144"" 2016-06-10 18:17:15 -07:00
Dawn Chen
56a1464390 Merge pull request #27223 from kubernetes/revert-27215-gke-pinned
Revert "third time charm for #27144"
2016-06-10 17:58:11 -07:00
Dawn Chen
f1651a0d34 Revert "third time charm for #27144" 2016-06-10 17:57:09 -07:00
Dawn Chen
2e0e22a80a Merge pull request #27222 from kubernetes/revert-27217-server-version
Revert "e2e-runner.sh: don't overwrite readonly var"
2016-06-10 17:56:46 -07:00
Dawn Chen
da90405844 Revert "e2e-runner.sh: don't overwrite readonly var" 2016-06-10 17:56:03 -07:00
Jeff Lowdermilk
afc4c96b84 Merge pull request #27217 from jlowdermilk/server-version
e2e-runner.sh: don't overwrite readonly var
2016-06-10 17:03:11 -07:00
Dawn Chen
5b5c8076cc Merge pull request #27218 from dchen1107/docker
revert both commits breaking swagger-check
2016-06-10 16:53:38 -07:00
Dawn Chen
88de86fcb9 Revert "Versioning docs and examples for v1.4.0-alpha.0."
This reverts commit cce9db3aa9.
2016-06-10 16:46:46 -07:00
Dawn Chen
9ee6809586 Revert "Update the latestReleaseBranch to release-1.3 in the munger."
This reverts commit 3beed6e1aa.
2016-06-10 16:46:11 -07:00
Jeff Lowdermilk
f6c3eb8179 e2e-runner.sh: don't overwrite readonly var 2016-06-10 16:45:40 -07:00
Jeff Lowdermilk
ff4f394d1e Merge pull request #27215 from jlowdermilk/gke-pinned
third time charm for #27144
2016-06-10 16:34:31 -07:00
Jeff Lowdermilk
eab35fb037 third time charm for #27144
We really need a way to test the e2e-runner.
2016-06-10 16:18:53 -07:00
Dawn Chen
70c945a5ea Merge pull request #27166 from quinton-hoole/2016-06-09-add-secrets-to-fed-cluster-e2e-test
Add secret to Federation API Server e2e test.
2016-06-10 16:05:50 -07:00
Jeff Lowdermilk
98fbf8c0f0 Merge pull request #27207 from jlowdermilk/fix-gke-pinned-tests
Fix #27144
2016-06-10 15:57:18 -07:00
Jeff Lowdermilk
e47b9f36aa Fix #27144 2016-06-10 15:54:51 -07:00
David McMahon
3beed6e1aa Update the latestReleaseBranch to release-1.3 in the munger. 2016-06-10 14:55:46 -07:00
David McMahon
cce9db3aa9 Versioning docs and examples for v1.4.0-alpha.0. 2016-06-10 14:55:35 -07:00
Jeff Lowdermilk
09a35325de Merge pull request #27144 from jlowdermilk/gke-branch-tests
Use latest branch build for GKE tests.
2016-06-10 14:23:32 -07:00
Janet Kuo
c160f75157 Fix deployment strategy validation 2016-06-10 11:14:32 -07:00
Janet Kuo
5d582501b4 Add unit test for deployment strategy validation 2016-06-10 10:16:49 -07:00
Janet Kuo
13718846d8 In case of i/o timeout error in kubectl e2e, try talking to the server again after 2s before dying 2016-06-10 10:06:46 -07:00
Janet Kuo
764df2e096 Listing pods only once when getting pods for RS in deployment 2016-06-10 09:55:28 -07:00
Wojciech Tyczynski
60c1ec8eac Merge pull request #27184 from kubernetes/revert-25737-scheduledjob_test
Revert "ScheduledJob tests"
2016-06-10 17:27:31 +02:00
Filip Grzadkowski
701b6c7720 Merge pull request #27186 from mwielgus/bump-ca-0.1.3
Bump Cluster Autoscaler version to 0.1.3
2016-06-10 16:30:13 +02:00
Marcin Wielgus
fe4ee026d6 Bump Cluster Autoscaler version to 0.1.3 2016-06-10 16:26:04 +02:00
Piotr Szczesniak
ba1c8a2ac5 Revert "ScheduledJob tests" 2016-06-10 16:22:04 +02:00
Piotr Szczesniak
760c563c72 Merge pull request #27123 from jszczepkowski/hpa-e2e-fix3
Fixed GetGroupNodes method: wrong regexp function was used.
2016-06-10 15:02:39 +02:00
k8s-merge-robot
4793372a85 Merge pull request #25888 from rootfs/attacher-aws-cinder
Automatic merge from submit-queue

implement EBS and Cinder attacher/detacher 

follow up with #21709

@kubernetes/sig-storage
2016-06-10 05:39:22 -07:00
Wojciech Tyczynski
731409ee15 Merge pull request #27176 from kubernetes/revert-26188-test_main
Revert "Add a custom main instead of the standard test main, to reduce stack …"
2016-06-10 13:53:49 +02:00
k8s-merge-robot
447ce334ad Merge pull request #27117 from mwielgus/rename-2
Automatic merge from submit-queue

Rename ENABLE_NODE_AUTOSCALER to ENABLE_CLUSTER_AUTOSCALER - part 2

Follow up of https://github.com/kubernetes/kubernetes/pull/26993

cc: @fgrzadkowski @piosz @jszczepkowski 

```release-note
Rename environment variables (KUBE_)ENABLE_NODE_AUTOSCALER to (KUBE_)ENABLE_CLUSTER_AUTOSCALER. 
```

Fixes https://github.com/kubernetes/kubernetes/issues/26343
2016-06-10 04:48:06 -07:00
k8s-merge-robot
8c88cbe74c Merge pull request #27143 from adityakali/localssd
Automatic merge from submit-queue

support for mounting local-ssds on GCI

This change adds support for mounting local ssds on GCI.
It updates the previous container-vm behavior as well to
match that for GCI nodes by mounting the local-ssds under
the same path (/mnt/disks/ssdN).

@vulpecula @roberthbailey @andyzheng0831 @kubernetes/goog-image
2016-06-10 04:05:21 -07:00
k8s-merge-robot
c71fd7b1ae Merge pull request #27031 from sttts/sttts-flake-26955-pod-logs
Automatic merge from submit-queue

Flake 26955: portforwarding e2e: print logs when pod doesn't terminate

For more insights why flake #26955 happens.
2016-06-10 03:24:36 -07:00
Wojciech Tyczynski
cfd8173f92 Revert "Add a custom main instead of the standard test main, to reduce stack …" 2016-06-10 11:49:42 +02:00
k8s-merge-robot
38a1fb2b96 Merge pull request #27136 from andyzheng0831/gci-firewall
Automatic merge from submit-queue

Trusty: fix the 'ping' issue and fluentd-gcp issue #26379

This PR is mainly for being picking up the fix in #27016 and #27102 in trusty code, so that we can fix the issues in the release-1.2 branch for GCI. It contains two parts:

(1) Adding iptables rules to accept ICMP traffic, otherwise 'ping' from a pod does not work;

(2) Revising the code for cleaning up docker0 stuff including the bridge and iptables rules. I slightly refactor the code of starting kubelet and removing docker0 stuff before starting kubelet. The old code did it after starting kubelet but before restarting docker. I think doing it before starting kubelet is safter.

cc/ @roberthbailey @fabioy @dchen1107 @a-robinson @kubernetes/goog-image
2016-06-10 02:33:49 -07:00
k8s-merge-robot
07f72acaa2 Merge pull request #27098 from yifan-gu/rkt_getlog
Automatic merge from submit-queue

rkt: Replace 'journalctl' with rkt's GetLogs() API.

This replaced the `journactl` shell out with rkt's GetLogs() API.
Fixes #26997 

To make this fully work, we need rkt to have this patch #https://github.com/coreos/rkt/pull/2763

cc @kubernetes/sig-node @euank @alban @iaguis @jonboulle
2016-06-10 01:54:05 -07:00
k8s-merge-robot
1f18eee335 Merge pull request #27092 from euank/monitoring-api-version
Automatic merge from submit-queue

cluster/gce/coreos: Update heapster apiVersion

This fixes an inadvertant search-replace error in #26617.
The error was missed then because the search-replace issue wasn't
present in the standalone controllers, but was in all the others.

I verified that with this change heapster comes up under the default influxdb monitoring and without this change addon manager spits out validation failure errors for the heapster yaml.

cc @yifan-gu
2016-06-10 01:01:44 -07:00
k8s-merge-robot
ade299c18f Merge pull request #27146 from mikedanese/nil-ptr
Automatic merge from submit-queue

oidc: fix test nil pointer

```
2016-06-09 13:12:37.262983 I | http: TLS handshake error from 127.0.0.1:32814: remote error: bad certificate
PASS
--- FAIL: TestNewOIDCAuthProvider (0.87s)
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
        panic: runtime error: invalid memory address or nil pointer dereference
[signal 0xb code=0x1 addr=0x0 pc=0x5d91ca]

goroutine 12 [running]:
panic(0x124bd00, 0xc8200101f0)
        /usr/local/google/home/mikedanese/.gimme/versions/go1.6.1.linux.amd64/src/runtime/panic.go:464 +0x3e6
testing.tRunner.func1(0xc820023b90)
        /usr/local/google/home/mikedanese/.gimme/versions/go1.6.1.linux.amd64/src/testing/testing.go:467 +0x192
panic(0x124bd00, 0xc8200101f0)
        /usr/local/google/home/mikedanese/.gimme/versions/go1.6.1.linux.amd64/src/runtime/panic.go:426 +0x4e9
k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc/testing.(*OIDCProvider).AddMinimalProviderConfig(0xc820020580, 0x0)
        /usr/local/google/home/mikedanese/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc/testing/provider.go:85 +0x2a
k8s.io/kubernetes/plugin/pkg/client/auth/oidc.TestNewOIDCAuthProvider(0xc820023b90)
        /usr/local/google/home/mikedanese/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/plugin/pkg/client/auth/oidc/oidc_test.go:51 +0x367
testing.tRunner(0xc820023b90, 0x1d0a360)
        /usr/local/google/home/mikedanese/.gimme/versions/go1.6.1.linux.amd64/src/testing/testing.go:473 +0x98
created by testing.RunTests
        /usr/local/google/home/mikedanese/.gimme/versions/go1.6.1.linux.amd64/src/testing/testing.go:582 +0x892
FAIL    k8s.io/kubernetes/plugin/pkg/client/auth/oidc   3.081s
```

cc @bobbyrullo @yifan-gu
2016-06-10 00:12:28 -07:00