Move release-1.2 forward to 3d58b9c07fdd2bf8cb063c30d791b94649b794e5 #22710

eparis · 2016-03-08T21:25:09Z

however this excludes PR #22430

for vsphere provider docker currently only supports 1.9.1 release. The older versions of docker are failing on jessie due to issue moby/moby#18793 and newer version 1.10.x is not properly tested.

All AWS errors should be wrapped in a user-friendly error before returning.

…se.sh Resolves issue kubernetes#22139

Issue kubernetes#21952

Configurations in config-default.sh should take default values if they are set outside of the script. `roles` option is an exception. This patch fix it to maintain consistency behavior with other options.

…w gcr image consistent with the code base. Change the label on the daemonset to 'app'.

bgrant0607 · 2016-03-08T21:55:43Z

cc @david-mcmahon

bgrant0607 · 2016-03-08T21:56:54Z

Diff:
https://gist.githubusercontent.com/eparis/591788686969412309e4/raw/98fc74502eb9cc72432e4c02604774196277dab4/git%2520diff%2520release-1.2..upstream%2520master

eparis · 2016-03-08T21:59:02Z

I'm trying to figure out how to get a diffstat without the (obvious) docs nonsense... We'll see....

bgrant0607 · 2016-03-08T22:01:47Z

The diff of the PR I wanted to exclude is at the bottom. At a glance, the rest looks like doc-munging-related changes.

k8s-bot · 2016-03-08T22:05:38Z

GCE e2e build/test passed for commit 3eb6278.

eparis · 2016-03-08T22:16:24Z

Diff from this PR to upstream master (3d58b9c)

https://gist.github.com/eparis/591788686969412309e4

This diff ignores all changes to files which end in .md
This diff ignores all changes which include the words 'releases.k8s.io'

This is the rest....

eparis · 2016-03-08T22:20:55Z

I got that diff by adding the following to my .git/config

[diff]
    tool = eparis-diff
[difftool "eparis-diff"]
    cmd = /tmp/diff.sh $LOCAL $REMOTE

And then putting the following in /tmp/diff.sh

#!/bin/bash

LOCAL="$1"
REMOTE="$2"

if [[ $LOCAL == *".md" ]]; then
    exit
fi

diff -Naup -I 'releases.k8s.io' "${LOCAL}" "${REMOTE}"

And running:

git difftool -y 3eb6278653c09c9f99f13f31fbdcaf1984dca65f..3d58b9c07fdd2bf8cb063c30d791b94649b794e5

So now you can reproduce my results at home!

(I am assuming that everyone will have my commit in their tree, in case you don't and are interested...)

I have

[remote "upstream"]
    url = https://github.com/kubernetes/kubernetes
    pushurl = crap
    fetch = +refs/heads/*:refs/remotes/upstream/*
    fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*

So all I have to do is

git remote update
git show upstream/pr/22710
  or
git show 3eb6278653c09c9f99f13f31fbdcaf1984dca65f

bgrant0607 · 2016-03-08T22:23:40Z

Awesome. LGTM

bgrant0607 · 2016-03-08T22:25:15Z

cc @roberthbailey

david-mcmahon · 2016-03-08T22:27:22Z

Can we include the reproduction steps here for history's sake? In case we need to do something like this in the future. Commands with comments, please.

eparis · 2016-03-08T22:46:40Z

Notice this does not 'rewrite' history, it does not leave a vestigial tag, it just marches the release-1.2 branch forward. I hope people won't need to do this often. A wholesale update like this just doesn't belong. But basically what happened was the bgrant reviewed every PR between the release-1.2 branch (4d599ea) and master (3d58b9c) he indicated every commit between those 2 points was reasonable for 1.2 except possibly #22430. So I found the first commit before the problematic PR. That first commit was 7e9256b.

So my basic steps (with a bit of pseudo-code)

// create my local release-1.2 branch
- git checkout -b release-1.2 upstream/release-1.2

// Merge everything in master that we know is good into the release-1.2 branch
// but automatically solve conflicts by taking 'their' changes.
- git merge 7e9256b39 -X theirs

// Get all of the merges that I didn't get from the merge
- git log --merges 7e9256b39..3d58b9c07fdd2b --oneline --reverse
        a6aaf81 Merge pull request #22430 from gmarek/round-robin
        1c6a6aa Merge pull request #22697 from eparis/docs-readme-link
        43aa3d3 Merge pull request #18338 from gmarek/register-kubelet
        75699ff Merge pull request #22458 from bprashanth/ing_tls_e2e
        3d58b9c Merge pull request #22678 from spxtr/feature-tests

// For each merge I need to cherry-pick. We know that parent #1 of each merge is the 'trunk'
// so that helps. I do this for all of the above EXCEPT a6aaf81
- git cherry-pick -m 1 $SHA

// Sadly a 1c6a6aa touches docs and so does the release branch, so it had a conflict.
- git status // to see what files were a problem
- vim + filenames to fix the problems
- git add $filenames
- git commit

// Now we've got all the code we need but most likely the -X theirs merge strategy screwed up the docs. So we re-run
- build/versionize-docs.sh

// Then we push it and open the PR and feel really smug.
- git push eparis release-1.2:release-1.2

bgrant0607 · 2016-03-09T00:06:31Z

Merging.

Move release-1.2 forward to 3d58b9c

gswallow and others added 30 commits February 9, 2016 16:35

Use local_ipv4 when public_ipv4 is not present.

646c22e

restricting the version of docker to 1.9.x for vsphere support

e1a7441

for vsphere provider docker currently only supports 1.9.1 release. The older versions of docker are failing on jessie due to issue moby/moby#18793 and newer version 1.10.x is not properly tested.

enable health check for kube-proxy when wrapped in hyperkube

0790a6a

Remove host command sniffing from CanSupport(..)

7fed6f9

AWS: Wrap AWS error when failing to create security group ingress

e50ae40

All AWS errors should be wrapped in a user-friendly error before returning.

fix ParameterCodec for thirdparty resource

5b108ac

adding a unit test

4adb110

kubelet: Sort the container statuses in convertStatusToAPIStatus().

168ec8b

Update mesos godeps to remove transient dependency on testify/mock

9da747d

Remove sentinel file from atomic writer

26471d5

Updated default k8s release to 1.1.8 in cluster/ubuntu/download-relea…

c33ceff

…se.sh Resolves issue kubernetes#22139

DeamonSet test expect daemons on unschedulable Nodes

ba8a67e

Apply exponential backoff in servicecontroller before retrying

5b3bb56

Issue kubernetes#21952

Continue logging failure to contact metadata url, fix conn leak.

fe0f112

fix setting node roles error in deployment on ubuntu

9c5d82d

Configurations in config-default.sh should take default values if they are set outside of the script. `roles` option is an exception. This patch fix it to maintain consistency behavior with other options.

Move isMasterNode function to api/helpers

6697834

add lookup cache for daemonset

7e1ab26

Increase QPS limits in integration and e2e tests

c47aa36

Cassandra example: daemonset volume fix, readme cleanup, update to ne…

04a5854

…w gcr image consistent with the code base. Change the label on the daemonset to 'app'.

Backoff restart container with liveness probing failure

a88dad1

minimal hostPath fix

09ad2da

e2e: add kubelet resource usage test to monitor 100 pods per node

216727c

e2e: print runtime MemStats when memory usage exceeds expectation

52d75d2

Move isMasterNode function to api/helpers

4ef6f1c

Make scheduler predicates test work with registered master

496fc3c

make kubectl logs work for replication controllers

f8f45df

Quota replenishment should only add quotas that track the resource

04b8095

Add a simple clusterapi-tester, improve e2e logging.

33bb8e8

Wait till netexec is Ready in kubeproxy e2e

92ff05f

Improve deployment error logs

87a240f

k8s-github-robot added kind/old-docs size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 8, 2016

bgrant0607 added cla: human-approved and removed cla: no labels Mar 8, 2016

bgrant0607 assigned bgrant0607 and unassigned j3ffml Mar 8, 2016

bgrant0607 added this to the v1.2 milestone Mar 8, 2016

bgrant0607 mentioned this pull request Mar 8, 2016

Start release-1.2 CI #22672

Closed

googlebot added the cla: no label Mar 8, 2016

bgrant0607 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 8, 2016

bgrant0607 added a commit that referenced this pull request Mar 9, 2016

Merge pull request #22710 from eparis/release-1.2

e9a3ef2

Move release-1.2 forward to 3d58b9c

bgrant0607 merged commit e9a3ef2 into kubernetes:release-1.2 Mar 9, 2016

roberthbailey mentioned this pull request Mar 9, 2016

enable master kubelet in gce-default to match gce-test #22709

Merged

bgrant0607 mentioned this pull request Mar 16, 2016

Fix for issue #22932 infinite pod restarts with CNI #23050

Merged

bgrant0607 mentioned this pull request Mar 23, 2016

Update the cherry-pick guide to guide based on new batching method. #23345

Merged

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016

Merge pull request kubernetes#22710 from eparis/release-1.2

862cf6f

Move release-1.2 forward to 3d58b9c

shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017

Merge pull request kubernetes#22710 from eparis/release-1.2

57018cf

Move release-1.2 forward to 3d58b9c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move release-1.2 forward to 3d58b9c07fdd2bf8cb063c30d791b94649b794e5 #22710

Move release-1.2 forward to 3d58b9c07fdd2bf8cb063c30d791b94649b794e5 #22710

eparis commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

eparis commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

k8s-bot commented Mar 8, 2016

eparis commented Mar 8, 2016

eparis commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

david-mcmahon commented Mar 8, 2016

eparis commented Mar 8, 2016

bgrant0607 commented Mar 9, 2016

Move release-1.2 forward to 3d58b9c07fdd2bf8cb063c30d791b94649b794e5 #22710

Move release-1.2 forward to 3d58b9c07fdd2bf8cb063c30d791b94649b794e5 #22710

Conversation

eparis commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

eparis commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

k8s-bot commented Mar 8, 2016

eparis commented Mar 8, 2016

eparis commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

bgrant0607 commented Mar 8, 2016

david-mcmahon commented Mar 8, 2016

eparis commented Mar 8, 2016

bgrant0607 commented Mar 9, 2016