1.3 upstream picks #9790

smarterclayton · 2016-07-12T01:40:41Z

PRs that should be included in the 1.3 release:

kube pulls

Description	Upstream PR	Upstream Merge	Origin PR	Status
Allow specifying secret data using strings	kubernetes/kubernetes#28263	7/1/16 3:28:56 AM	#9663	Merged
kubectl: don't display empty list when trying to get a single resource that isn't found	kubernetes/kubernetes#28294	7/1/16 4:40:46 PM	#10247	Merged
Add MinReadySeconds to rolling updater	kubernetes/kubernetes#28111	7/1/16 10:21:16 PM	#9852	Merged
Add ForgetPod to SchedulerCache	kubernetes/kubernetes#28886	7/14/16 8:30:23 AM	#10247	Merged
node controller allocation changes	kubernetes/kubernetes#29063	7/16/16 8:27:56 PM	#10247	Merged
docker_manager: Correct determineContainerIP args	kubernetes/kubernetes#29171	7/20/16 3:26:37 PM	#10141	Merged
Kubelet: Set PruneChildren when removing image	kubernetes/kubernetes#29246	7/20/16 3:59:54 PM	#10247	Merged
node controller allocation changes part 2	kubernetes/kubernetes#29576	7/27/16 3:59 AM	#10247	Merged
Add Apps() and PetSet client to client/unversioned	kubernetes/kubernetes#29655	7/28/16 4:54:16 PM	#9972	Merged
Allow PVs to specify supplemental GIDs	kubernetes/kubernetes#29961	8/4/16 1:45:23 PM	#10247	Merged

cadvisor pulls

Description	Upstream PR	Upstream Merge	Origin PR	Status
Make ThinPoolWatcher loglevel consistent	google/cadvisor#1359	7/28/16 12:56:08 PM	#10247	Merged
make sure we only use thin_ls on kernels that have the fix to prevent thinpool corruption	google/cadvisor#1411	8/4/16 4:20:09 PM	#10227	Merged

0xmichalis · 2016-07-13T19:51:52Z

Add MinReadySeconds to rolling updater: kubernetes/kubernetes#28111

liggitt · 2016-07-17T03:50:08Z

kubernetes/kubernetes#29063 for node controller allocation changes?
kubernetes/kubernetes#29576 for follow up fixes?
kubernetes/kubernetes#29985 for more follow up fixes?

liggitt · 2016-07-20T03:21:43Z

~~kubernetes/kubernetes#29152 for GCE metadata query hang~~ dupe of 28871 listed in #9790 (comment)

ncdc · 2016-07-20T13:28:38Z

kubernetes/kubernetes#29246 to fix a regression in image GC / pruning introduced with the switch from go-dockerclient to engine-api

0xmichalis · 2016-07-20T14:18:14Z

For replica sets:
kubernetes/kubernetes#24733
kubernetes/kubernetes#29183

per comment below, we aren't picking these for 1.3

ncdc · 2016-07-22T18:31:27Z

Fix httpclient setup for gcp credential provider to have timeout: kubernetes/kubernetes#28539

Pick UPSTREAM: 28539: Fix httpclient setup for gcp #10095 has merged

Do not query the metadata server to find out if running on GCE. Retry metadata server query for gcr if running on gce. kubernetes/kubernetes#28871

Pick UPSTREAM: 28871: Do not use metadata server to know if on GCE #10094 has merged

derekwaynecarr · 2016-07-22T18:42:53Z

For quota on nodeports:
kubernetes/kubernetes#29457

Pick: #10089 has merged

liggitt · 2016-07-26T18:57:22Z

~~kubernetes/kubernetes#29560 fixes using the same configmap in multiple volumes~~ included in Paul's storage picks comment below

smarterclayton · 2016-07-28T01:25:04Z

Let's go ahead and cherry pick (once baseline review is done) to unblock the merge queue

ncdc · 2016-07-28T23:15:48Z

Reduce cadvisor ThinPoolWatcher log spam google/cadvisor#1359

ncdc · 2016-07-28T23:28:02Z

@smarterclayton what do you mean by baseline review?

smarterclayton · 2016-07-28T23:47:41Z

No sudden surprises from upstream after we merge?

pmorie · 2016-08-01T19:43:09Z

Full list of what's needed for storage; first level is upstream cherry-pick, second level is upstream master PRs:

Automated cherry pick of #29077 upstream release 1.3 kubernetes/kubernetes#29562
- Fix "PVC Volume not detached if pod deleted via namespace deletion" issue kubernetes/kubernetes#29077 - fix PVC volume not detached if pod deleted via namespace deletion
Automated cherry pick of #28048 #28090 #28181 #28404 #29031 upstream release 1.3 kubernetes/kubernetes#29561
- disable flaky PD test kubernetes/kubernetes#28048 - disable flaky PD test
- Mark "RW PD, remove it, then schedule" test flaky kubernetes/kubernetes#28090 - mark 'RW PD, remove it, then schedule' test disabled
- Add two pd tests with default grace period kubernetes/kubernetes#28181 - add two pd test with default grace period
- Move ungraceful PD tests out of flaky kubernetes/kubernetes#28404 - move ungraceful PD tests out of flaky
- Make PD E2E Tests Wait for Detach to Prevent Kernel Errors kubernetes/kubernetes#29031 - wait for PD detach on PD E2E to prevent kernel error
Automated cherry pick of #29240 kubernetes/kubernetes#29554
- NewVolumeManager expects nodeName instead of hostName. kubernetes/kubernetes#29240 - pass nodeName to VolumeManager instead of hostName
Automated cherry pick of #28534 upstream release 1.3 kubernetes/kubernetes#29560
- Add spec.Name() to the configmap GetVolumeName() kubernetes/kubernetes#28534 - Add spec.Name to the configmap GetVolumeName
Automated cherry pick of #24385 #29485 upstream release 1.3 kubernetes/kubernetes#29570
- golint fixes for AWS cloudprovider kubernetes/kubernetes#24385 - golint fixes for AWS cloudprovider
- Assume volume is detached if node doesn't exist kubernetes/kubernetes#29485 - Assume volume is detached if node doesn't exist
Automated cherry pick of #24797 upstream release 1.3 kubernetes/kubernetes#29566
- add enhanced volume and mount logging for block devices kubernetes/kubernetes#24797 - Add enhanced volume and mount logging for block devices
Automated cherry pick of #28153 #28409 #28939 upstream release 1.3 kubernetes/kubernetes#29569
- Fixed goroutinemap race on Wait() kubernetes/kubernetes#28153 - Fix goroutine map race on Wait()
- Reorganize volume controllers and manager kubernetes/kubernetes#28409 - Reorganize volume controllers and manager
- Allow mounts to run in parallel for non-attachable volumes kubernetes/kubernetes#28939 - Allow mounts to run in parallel for non-attachable volumes
Automated cherry pick of #29641 kubernetes/kubernetes#29704
- [k8s.io] Variable Expansion should allow composing env vars into new env vars [Conformance] {Kubernetes e2e suite} kubernetes/kubernetes#29461 - Fix wrapped volume race
Automated cherry pick of #29673 kubernetes/kubernetes#29746
- Fix mount collision timeout issue kubernetes/kubernetes#29673 - Fix mount collision timeout issue

pmorie · 2016-08-02T16:32:04Z

kubernetes/kubernetes#29171 is needed to make downward API for pod IP work when using a network plugin.

pweil- · 2016-08-03T20:41:48Z

kubernetes/kubernetes#30021 fixes #9739 (pick waiting upstream approval in #10191)

deads2k · 2016-08-04T18:56:30Z

For replica sets:
kubernetes/kubernetes#24733
kubernetes/kubernetes#29183

These can be removed from the pick list. Without cohabitation, we can defer the need for conversions between RC and RS. RS is still in a beta version and we have both controllers running.

liggitt · 2016-08-04T19:32:16Z

kubernetes/kubernetes#29961 for supplemental GIDs on PVs

smarterclayton · 2016-08-04T19:54:56Z

kubernetes/kubernetes#29655 for pet sets

On Thu, Aug 4, 2016 at 3:32 PM, Jordan Liggitt notifications@github.com
wrote:

kubernetes/kubernetes#29961
kubernetes/kubernetes#29961 for supplemental
GIDs on PVs

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9790 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p65LdWT6nMvlzr5JNmQO204nhVbhks5qcj5EgaJpZM4JJ9TJ
.

ncdc · 2016-08-04T20:43:09Z

google/cadvisor#1411 to make sure we only use thin_ls on kernels that have the fix to prevent thinpool corruption

pick UPSTREAM: google/cadvisor: 1411: Ensure minimum kernel version for thin_ls #10227

ncdc · 2016-08-04T21:08:13Z

^^^^^^^^^^ everything above this list is in the description or has already merged to origin

derekwaynecarr · 2016-08-05T18:35:58Z

PICK #10385

google/cadvisor#1380 to fix working set memory stats calculation. failure to have this PR would make memory available under report memory pressure. we also need to document that memory-based eviction is ONLY functional if swap is disabled (see kubernetes/kubernetes#28619 (comment))

derekwaynecarr · 2016-08-05T18:39:48Z

PICK #10385

google/cadvisor#1395 -- filesystem usage stats are incorrect in v2 api.

derekwaynecarr · 2016-08-10T18:24:27Z

~~kubernetes/kubernetes#30386 -- do not allow negative pvc requests.storage~~

removing from the list as it's not a blocker

smarterclayton · 2016-08-11T02:28:14Z

PICK #10385

I think we want kubernetes/kubernetes#30277 if it merges in the next day or so. I see this in my profiles as well, and it's low risk.

ncdc · 2016-08-12T13:24:13Z

PICK #10467

Fix default resource limits for downward api volumes kubernetes/kubernetes#29639

ncdc · 2016-08-12T14:04:29Z

PICK #10385

Exclude Docker devicemapper mounts from fs info google/cadvisor#1358

deads2k · 2016-08-18T11:55:07Z

PICK #10504

kubernetes/kubernetes#30839 deltafifo usage can cause fatal error: concurrent map writes

timothysc · 2016-08-18T15:52:41Z

@deads2k That is likely related to a weird issues we are seeing.

/cc @mffiedler

deads2k · 2016-08-18T17:32:48Z

@deads2k That is likely related to a weird issues we are seeing.

Yeah, thanks for the tip off on that.

timothysc · 2016-08-18T20:13:17Z

I ran a report from our sha that @ncdc sent against the head of upstream looking for panic|crash|race results are here:
https://paste.fedoraproject.org/410461/71550994/

We stumbled upon a crash in testing, my guess is there are more.

ncdc · 2016-08-18T20:26:55Z

I will review Tim's report tonight starting around 8:30pm EDT. I'll do as much as I can to determine what we need to pick, start doing picks, and then handoff to Europe when I am done for the night.

eparis · 2016-08-18T20:34:35Z

This comment is everything from Tim's list just trying to make it easier to go through.

^^^^^^^^
Everything above this line is either not needed or in #10526. Everything below needs to be evaluated and potentially cherry picked.

timothysc · 2016-08-18T21:40:01Z

might want to add lock to that query

ingvagabund · 2016-08-19T08:53:29Z

With respect to the origin master HEAD (e5178ec):

~~Fixed goroutinemap race on Wait() kubernetes/kubernetes#28153 kubernetes/kubernetes@06082b1 Fixed goroutinemap race on Wait()~~ {already cherry-picked}
e2e.framework.util.StartPods: panic if the number or replicas is zero kubernetes/kubernetes#25255 kubernetes/kubernetes@e0b8595 Merge pull request test: Report disruption flakes correctly in junit #25255 from ingvagabund/e2e-framework-util-StartPods-panic-for-zero-replicas {already cherry-picked}
Add unit test for zone addition to all dnsproviders. Fixes #27785 kubernetes/kubernetes#27831 kubernetes/kubernetes@de1719e Merge pull request [release-4.13] OCPBUGS-11146: DisableSC test should ignore in-tree storage classes #27831 from quinton-hoole/2016-06-21-fix-panic-in-dns-zone-creation {federation not in origin}
Fix bugs in DeltaFIFO kubernetes/kubernetes#27435 kubernetes/kubernetes@8bc4e9b Merge pull request OCPBUGS-4850: Add Kuryr exception to "pods should successfully create sandboxes" test #27435 from wojtek-t/fix_delta_fifo_race {already cherry-picked}
~~Fix race in informer kubernetes/kubernetes#27341 kubernetes/kubernetes@5d702a3 Fix race in informer~~ {already cherry picked in origin master}
~~Removes shorthand flag -w from kubectl apply kubernetes/kubernetes#37345 kubernetes/kubernetes@80d1ae7 Fix panic in TestUnschedulableNodes~~ {already cherry-picked}
Fix data race in volume controller unit test. kubernetes/kubernetes#26410 kubernetes/kubernetes@335da9b Merge pull request Bug 1992596: e2e/cli: Move annotations.sh to proper e2e #26410 from jsafrane/fix-test-race {already cherry-picked}
~~Fix data race in volume controller unit test. kubernetes/kubernetes#26410 kubernetes/kubernetes@2d43e45 Fix data race in volume controller unit test.~~ {already cherry-picked}
Fix panic in kubelet test kubernetes/kubernetes#26642 kubernetes/kubernetes@9038213 Merge pull request double space preventing proper reporting for disruption #26642 from wojtek-t/fix_kubelet_test_panics {already cherry-picked}
~~Fix panic in kubelet test kubernetes/kubernetes#26642 kubernetes/kubernetes@13b57f8 Fix panic in kubelet test~~ {already cherry-picked}
~~Fix fake event recorder race kubernetes/kubernetes#26619 kubernetes/kubernetes@ee74cc4 Fix fake event recorder race~~ {already cherry-picked}
~~Fix apiservers crashes kubernetes/kubernetes#26564 kubernetes/kubernetes@d002cb1 Fix apiservers crashes~~ {already cherry-picked}
~~rkt: Fix docker auth config save directory to avoid race. kubernetes/kubernetes#26177 kubernetes/kubernetes@1d40f47 rkt: Fix docker auth config save directory to avoid race.~~ {already cherry-picked}
rkt: Fix panic in setting ReadOnlyRootFS kubernetes/kubernetes#26397 kubernetes/kubernetes@d00dec7 Merge pull request fix: add proxy support to OAuthServer tests #26397 from euank/fixReadOnlyRootfsPanic {already cherry-picked}
~~rkt: Fix panic in setting ReadOnlyRootFS kubernetes/kubernetes#26397 kubernetes/kubernetes@ecfd8f7 rkt: Fix panic in setting ReadOnlyRootFS~~ {already cherry-picked}
~~Various kubenet fixes (panics and bugs and cidrs, oh my) kubernetes/kubernetes#26398 kubernetes/kubernetes@7e0b9bf kubenet: Fix panic when teardown run before setup~~ {already cherry-picked}
Fix DATA RACE in unit tests: reconciler_test.go kubernetes/kubernetes#26407 kubernetes/kubernetes@071cfe6 Merge pull request Bug 1986003: Switch kubeconfig retries to use backoff #26407 from saad-ali/fixRaceReconcilerTest {already cherry-picked}
~~Fix DATA RACE in unit tests: reconciler_test.go kubernetes/kubernetes#26407 kubernetes/kubernetes@3c345ab Fix DATA RACE in unit tests: reconciler_test.go~~ {already cherry-picked}
~~Fix panic when the namespace flag is not present kubernetes/kubernetes#26078 kubernetes/kubernetes@f79998a Fix panic when the namespace flag is not present~~ {already cherry-picked in rebase}
~~Fix panic in auth test failure kubernetes/kubernetes#26025 kubernetes/kubernetes@22649a1 Fix panic in auth test failure~~ {already cherry-picked}
Fixes panic on round tripper when TLS under a proxy kubernetes/kubernetes#25690 kubernetes/kubernetes@b7a31ad Merge pull request Bug 1898118: Logging more during ephemeral registry deployment #25690 from fabianofranz/fixes_panic_on_roundtripper_when_tls_under_proxy {already cherry-picked}
~~Fixes panic on round tripper when TLS under a proxy kubernetes/kubernetes#25690 kubernetes/kubernetes@5940040 Fixes panic on round tripper when TLS under a proxy~~ {the same as the one above}
fix rollout nil panice issue kubernetes/kubernetes#25308 kubernetes/kubernetes@a167a6b Merge pull request etcd-storage-test: apply 1.19 diff #25308 from AdoHe/deployment_panic {simple cherry-pick, fixed panic}
fix rollout nil panice issue kubernetes/kubernetes#25308 kubernetes/kubernetes@d1480cd fix rollout nil panice issue {the same as the one above}

0xmichalis · 2016-08-19T16:31:55Z

Maybe kubernetes/kubernetes#30998 ?

liggitt · 2016-08-19T16:43:29Z

Maybe kubernetes/kubernetes#30998?

no

deads2k · 2016-08-19T17:12:58Z

Maybe kubernetes/kubernetes#30998?
no

How about: "no, that's probably not the correct fix to the problem".

ncdc · 2016-08-22T20:19:43Z

I'm going to close this. Everything listed that needed to be cherry picked has already been picked.

smarterclayton assigned smarterclayton, ncdc and liggitt Jul 12, 2016

danmcp added the priority/P1 label Jul 12, 2016

liggitt mentioned this issue Aug 12, 2016

Check sup groups in PV beta feature #9361

Closed

ncdc mentioned this issue Aug 19, 2016

1.3 crash picks #10526

Closed

ncdc closed this as completed Aug 22, 2016

1.3 upstream picks #9790

1.3 upstream picks #9790

Comments

smarterclayton commented Jul 12, 2016 • edited by ncdc Loading

kube pulls

cadvisor pulls

0xmichalis commented Jul 13, 2016

liggitt commented Jul 17, 2016 • edited Loading

liggitt commented Jul 20, 2016 • edited by ncdc Loading

ncdc commented Jul 20, 2016

0xmichalis commented Jul 20, 2016 • edited by ncdc Loading

ncdc commented Jul 22, 2016 • edited Loading

derekwaynecarr commented Jul 22, 2016 • edited by ncdc Loading

liggitt commented Jul 26, 2016 • edited by ncdc Loading

smarterclayton commented Jul 28, 2016 via email

ncdc commented Jul 28, 2016 • edited Loading

ncdc commented Jul 28, 2016

smarterclayton commented Jul 28, 2016 via email

pmorie commented Aug 1, 2016 • edited by ncdc Loading

pmorie commented Aug 2, 2016

pweil- commented Aug 3, 2016

deads2k commented Aug 4, 2016

liggitt commented Aug 4, 2016

smarterclayton commented Aug 4, 2016

ncdc commented Aug 4, 2016 • edited Loading

ncdc commented Aug 4, 2016

derekwaynecarr commented Aug 5, 2016 • edited by ncdc Loading

derekwaynecarr commented Aug 5, 2016 • edited by ncdc Loading

derekwaynecarr commented Aug 10, 2016 • edited by ncdc Loading

smarterclayton commented Aug 11, 2016 • edited by ncdc Loading

ncdc commented Aug 12, 2016 • edited Loading

ncdc commented Aug 12, 2016 • edited Loading

deads2k commented Aug 18, 2016 • edited by ncdc Loading

timothysc commented Aug 18, 2016

deads2k commented Aug 18, 2016

timothysc commented Aug 18, 2016

ncdc commented Aug 18, 2016

eparis commented Aug 18, 2016 • edited by ncdc Loading

timothysc commented Aug 18, 2016

ingvagabund commented Aug 19, 2016

0xmichalis commented Aug 19, 2016

liggitt commented Aug 19, 2016

deads2k commented Aug 19, 2016

ncdc commented Aug 22, 2016

smarterclayton commented Jul 12, 2016 •

edited by ncdc

Loading

liggitt commented Jul 17, 2016 •

edited

Loading

liggitt commented Jul 20, 2016 •

edited by ncdc

Loading

0xmichalis commented Jul 20, 2016 •

edited by ncdc

Loading

ncdc commented Jul 22, 2016 •

edited

Loading

derekwaynecarr commented Jul 22, 2016 •

edited by ncdc

Loading

liggitt commented Jul 26, 2016 •

edited by ncdc

Loading

ncdc commented Jul 28, 2016 •

edited

Loading

pmorie commented Aug 1, 2016 •

edited by ncdc

Loading

ncdc commented Aug 4, 2016 •

edited

Loading

derekwaynecarr commented Aug 5, 2016 •

edited by ncdc

Loading

derekwaynecarr commented Aug 5, 2016 •

edited by ncdc

Loading

derekwaynecarr commented Aug 10, 2016 •

edited by ncdc

Loading

smarterclayton commented Aug 11, 2016 •

edited by ncdc

Loading

ncdc commented Aug 12, 2016 •

edited

Loading

ncdc commented Aug 12, 2016 •

edited

Loading

deads2k commented Aug 18, 2016 •

edited by ncdc

Loading

eparis commented Aug 18, 2016 •

edited by ncdc

Loading