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 #82602: Fix iptables version detection code to handle RHEL 7 #82650

Merged
merged 1 commit into from Sep 13, 2019
Merged

Automated cherry pick of #82602: Fix iptables version detection code to handle RHEL 7 #82650

merged 1 commit into from Sep 13, 2019

Conversation

danwinship
Copy link
Contributor

Cherry pick of #82602 on release-1.16.

#82602: Fix iptables version detection code to handle RHEL 7

@k8s-ci-robot
Copy link
Contributor

@danwinship: All 'parent' PRs of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement.

The following parent PRs have neither the "release-note" nor the "release-note-action-required" labels: #82602.

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.

@k8s-ci-robot k8s-ci-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 12, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Sep 12, 2019
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 12, 2019
@k8s-ci-robot
Copy link
Contributor

@danwinship: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. sig/network Categorizes an issue or PR as relevant to SIG Network. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 12, 2019
@danwinship
Copy link
Contributor Author

/release-note-none
/kind bug
/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 12, 2019
@danwinship
Copy link
Contributor Author

/assign @thockin

@eparis
Copy link
Contributor

eparis commented Sep 12, 2019

/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 12, 2019
@eparis
Copy link
Contributor

eparis commented Sep 12, 2019

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2019
@tpepper
Copy link
Member

tpepper commented Sep 12, 2019

Can folks confirm this is targeted for 1.16.0?

@danwinship
Copy link
Contributor Author

@tpepper Yes, 1.16.0

@thockin
Copy link
Member

thockin commented Sep 12, 2019 via email

@danwinship
Copy link
Contributor Author

/retest

2 similar comments
@danwinship
Copy link
Contributor Author

/retest

@mrunalp
Copy link
Contributor

mrunalp commented Sep 12, 2019

/retest

@danwinship
Copy link
Contributor Author

@lachie83 This is approved now. Can you remove do-not-merge/cherry-pick-not-approved? (Still waiting for pull-kubernetes-kubemark-e2e-gce-big to pass but that seems to be flaking for everyone.)

@liggitt
Copy link
Member

liggitt commented Sep 12, 2019

/retest

@justaugustus justaugustus added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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 12, 2019
@justaugustus
Copy link
Member

Approved on behalf of Release Managers:
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, eparis, justaugustus

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

@tpepper
Copy link
Member

tpepper commented Sep 12, 2019

/retest

@alejandrox1
Copy link
Contributor

for ref: https://prow.k8s.io/view/gcs/kubernetes-jenkins/pr-logs/pull/82650/pull-kubernetes-kubemark-e2e-gce-big/1172287537377447936/
/test pull-kubernetes-kubemark-e2e-gce-big

@alejandrox1
Copy link
Contributor

pref failure: https://prow.k8s.io/view/gcs/kubernetes-jenkins/pr-logs/pull/82650/pull-kubernetes-kubemark-e2e-gce-big/1172305543352553472/
/test pull-kubernetes-kubemark-e2e-gce-big

@liggitt
Copy link
Member

liggitt commented Sep 13, 2019

the test failure is likely due to kubernetes/perf-tests#788:

This will fail until #82579 gets in.

#82579 merged, but only to master. Picked it to release-1.16 in #82686, and once that merges, the test should go green again

@liggitt
Copy link
Member

liggitt commented Sep 13, 2019

/retest

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2019
This was referenced Sep 13, 2019
Merged
Merged
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 13, 2019
@k8s-ci-robot k8s-ci-robot merged commit 3151d32 into kubernetes:release-1.16 Sep 13, 2019
@danwinship danwinship deleted the automated-cherry-pick-of-#82602-upstream-release-1.16 branch September 13, 2019 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eparis eparis Awaiting requested review from eparis

@thockin thockin Awaiting requested review from thockin

Assignees

@justaugustus justaugustus

@thockin thockin

@eparis eparis

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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. sig/network Categorizes an issue or PR as relevant to SIG Network. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.16
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@danwinship @k8s-ci-robot @eparis @tpepper @thockin @mrunalp @liggitt @justaugustus @alejandrox1