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

Automated cherry pick of #51199 #52557

Merged
merged 1 commit into from
Sep 16, 2017
Merged

Automated cherry pick of #51199 #52557

merged 1 commit into from
Sep 16, 2017

Conversation

enisoc
Copy link
Member

@enisoc enisoc commented Sep 15, 2017 •
edited
Loading

Cherry pick of #51199 on release-1.6.

This allows users to completely avoid any disruption due to #48327, by first upgrading to a 1.6.x release containing this patch, before upgrading to 1.7.x.

#51199: Makes Hostname and Subdomain fields of v1.PodSpec settable

@enisoc
Makes Hostname and Subdomain fields of v1.PodSpec settable when empty…
c0f58c1 
… and updates the StatefulSet controller to set them when empty
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 15, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Sep 15, 2017
@enisoc enisoc added this to the v1.6 milestone Sep 15, 2017
@enisoc enisoc added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Sep 15, 2017
@enisoc enisoc assigned lavalamp and kow3ns and unassigned lavalamp and yujuhong Sep 15, 2017
@lavalamp
Copy link
Member

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 15, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enisoc, lavalamp

Associated issue: 51199

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 15, 2017
@enisoc
Copy link
Member Author

enisoc commented Sep 15, 2017

/retest

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

1 similar comment
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 6091610 into kubernetes:release-1.6 Sep 16, 2017
@enisoc enisoc deleted the automated-cherry-pick-of-#51199-upstream-release-1.6 branch September 22, 2017 18:34
@enisoc enisoc mentioned this pull request Sep 22, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Sep 22, 2017
Merge pull request #52918 from enisoc/sts-hostname-1.6
2bdf212 
Automatic merge from submit-queue.

StatefulSet: Fix auto-heal of Pod hostname/subdomain fields.

This is a followup to #52557, which was a backport of #51199.

The original fix was incomplete. It doesn't trigger unless we change the consistency check to look at the fields.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lavalamp lavalamp

@kow3ns kow3ns

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@enisoc @lavalamp @k8s-github-robot @fejta-bot @yujuhong @kow3ns @k8s-ci-robot