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.

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

Stop sorting downward api file lines #65992

Merged
merged 1 commit into from Jul 11, 2018

Conversation

@liggitt
Member

liggitt commented Jul 9, 2018

Fixes #65159

fixes an issue with multi-line annotations injected via downward API files getting scrambled
@liggitt

This comment has been minimized.

Show comment
Hide comment
Member

liggitt commented Jul 9, 2018

@liggitt

This comment has been minimized.

Show comment
Hide comment
@liggitt

liggitt Jul 10, 2018

Member

/retest

Member

liggitt commented Jul 10, 2018

/retest

@jsafrane

This comment has been minimized.

Show comment
Hide comment
@jsafrane

jsafrane Jul 10, 2018

Member

/lgtm

Member

jsafrane commented Jul 10, 2018

/lgtm

@liggitt

This comment has been minimized.

Show comment
Hide comment
@liggitt

liggitt Jul 10, 2018

Member

/assign @thockin
for pkg/fieldpath change

Member

liggitt commented Jul 10, 2018

/assign @thockin
for pkg/fieldpath change

@thockin

This comment has been minimized.

Show comment
Hide comment
@thockin

thockin Jul 10, 2018

Member

/lgtm
/approve

Member

thockin commented Jul 10, 2018

/lgtm
/approve

@k8s-ci-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-ci-robot

k8s-ci-robot Jul 10, 2018

Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, liggitt, thockin

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Contributor

k8s-ci-robot commented Jul 10, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, liggitt, thockin

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Jul 10, 2018

Contributor

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

Contributor

k8s-merge-robot commented Jul 10, 2018

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

@k8s-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Jul 11, 2018

Contributor

Automatic merge from submit-queue (batch tested with PRs 66038, 65992, 66008). If you want to cherry-pick this change to another branch, please follow the instructions here.

Contributor

k8s-merge-robot commented Jul 11, 2018

Automatic merge from submit-queue (batch tested with PRs 66038, 65992, 66008). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-merge-robot k8s-merge-robot merged commit 4a5f961 into kubernetes:master Jul 11, 2018

8 of 17 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-e2e-gce
Details
pull-kubernetes-e2e-gce Job triggered.
Details
pull-kubernetes-e2e-gce-100-performance Job triggered.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job triggered.
Details
pull-kubernetes-e2e-kops-aws Job triggered.
Details
pull-kubernetes-integration Job triggered.
Details
pull-kubernetes-kubemark-e2e-gce-big Job triggered.
Details
pull-kubernetes-node-e2e Job triggered.
Details
pull-kubernetes-verify Job triggered.
Details
cla/linuxfoundation liggitt authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-typecheck Job succeeded.
Details
@k8s-ci-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-ci-robot

k8s-ci-robot Jul 11, 2018

Contributor

@liggitt: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-kops-aws 3f09fec link /test pull-kubernetes-e2e-kops-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Contributor

k8s-ci-robot commented Jul 11, 2018

@liggitt: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-kops-aws 3f09fec link /test pull-kubernetes-e2e-kops-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@liggitt liggitt deleted the liggitt:downward-sorting branch Jul 11, 2018

@ryanmcnamara

This comment has been minimized.

Show comment
Hide comment
@ryanmcnamara

ryanmcnamara Jul 11, 2018

Contributor

Thanks @liggitt

Can we backport this fix to 1.11? @liggitt or @thockin ?
Since 1.12 is a ways out

Contributor

ryanmcnamara commented Jul 11, 2018

Thanks @liggitt

Can we backport this fix to 1.11? @liggitt or @thockin ?
Since 1.12 is a ways out

@liggitt

This comment has been minimized.

Show comment
Hide comment
@liggitt

liggitt Jul 11, 2018

Member

Can we backport this fix to 1.11?

I think that's reasonable. Opened #66077

Member

liggitt commented Jul 11, 2018

Can we backport this fix to 1.11?

I think that's reasonable. Opened #66077

k8s-merge-robot added a commit that referenced this pull request Aug 21, 2018

Merge pull request #66077 from liggitt/automated-cherry-pick-of-#65992-…
…upstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #65992: Stop sorting downward api file lines

Cherry pick of #65992 on release-1.11.

#65992: Stop sorting downward api file lines
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment