Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trusty: fix 'find' commands and add k8s license and motd info #26741

Merged
merged 1 commit into from
Jun 3, 2016
Merged

Trusty: fix 'find' commands and add k8s license and motd info #26741

merged 1 commit into from
Jun 3, 2016

Conversation

andyzheng0831
Copy link

This PR fixes several things which should be also cherry picked in release-1.2 branch:

  • Fix the 'find' command failure. See issue GCI doesn't work in europe-west1-c #26350 for the background;
  • Add k8s license file into /home/kubernetes and set /etc/motd info. We fixed this in cluster/gce/gci for 1.3 branch, but have not done it for 1.2 branch. This PR simply copies the code from the GCI support.

Please note that the trusty code in master branch is under best-effort maintenance and we don't guarantee prompt fixes. But for 1.2 branch, we need to guarantee its correctness. I will test this in 1.2 branch.

@roberthbailey and @zmerlynn please review it.

cc/ @dchen1107 @fabioy @kubernetes/goog-image FYI.

@andyzheng0831 andyzheng0831 added this to the v1.2 milestone Jun 2, 2016
@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Jun 2, 2016
@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2016
@roberthbailey roberthbailey modified the milestones: 1.3, v1.2 Jun 2, 2016
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@andyzheng0831 andyzheng0831 added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jun 2, 2016
@andyzheng0831
Copy link
Author

@roberthbailey it is correct to set milestone to 1.3? We will need to cherry pick it into release-1.2 branch, as the 'find' command bug hurt GKE nodes.

@roberthbailey
Copy link
Contributor

You have to have milestone 1.3 set for the submit queue to merge it to the master branch. Once it's merged we can set the milestone to 1.2 for the cherry pick process.

@roberthbailey
Copy link
Contributor

@k8s-bot test this issue: #IGNORE

@andyzheng0831
Copy link
Author

@k8s-bot test this issue: #23591

@goltermann goltermann modified the milestones: v1.3, 1.3 Jun 3, 2016
@andyzheng0831 andyzheng0831 mentioned this pull request Jun 3, 2016
Merged
@k8s-bot
Copy link

k8s-bot commented Jun 3, 2016

GCE e2e build/test failed for commit f087a3f.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@andyzheng0831
Copy link
Author

@k8s-bot test this issue: #IGNORE

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 73d9816 into kubernetes:master Jun 3, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 3, 2016

GCE e2e build/test passed for commit f087a3f.

@andyzheng0831 andyzheng0831 deleted the fix-trusty branch June 3, 2016 16:19
@andyzheng0831 andyzheng0831 modified the milestones: v1.2, v1.3 Jun 3, 2016
@andyzheng0831 andyzheng0831 mentioned this pull request Jun 3, 2016
Closed
@roberthbailey roberthbailey added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 3, 2016
@andyzheng0831 andyzheng0831 mentioned this pull request Jun 14, 2016
Merged
roberthbailey added a commit that referenced this pull request Jun 14, 2016
@roberthbailey
Merge pull request #27288 from andyzheng0831/automated-cherry-pick-of…
dee8bc5 
…-#26741-upstream-release-1.2

Automated cherry pick of #26741
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#27288 from andyzheng0831/automated-cher…
e730a3c 
…ry-pick-of-#26741-upstream-release-1.2

Automated cherry pick of kubernetes#26741
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@roberthbailey
Merge pull request kubernetes#27288 from andyzheng0831/automated-cher…
4fb50bf 
…ry-pick-of-#26741-upstream-release-1.2

Automated cherry pick of kubernetes#26741
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@zmerlynn zmerlynn

@roberthbailey roberthbailey

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
8 participants
@andyzheng0831 @k8s-cherrypick-bot @roberthbailey @k8s-bot @k8s-github-robot @zmerlynn @googlebot @goltermann