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

Add conntrack as a dependency of kubelet #71540

Merged
merged 2 commits into from
Nov 30, 2018
Merged

Add conntrack as a dependency of kubelet #71540

merged 2 commits into from
Nov 30, 2018

Conversation

mauilion
Copy link

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes: kubernetes/kubeadm#1287

Special notes for your reviewer:
This changes includes a commit from @detiber fixing bazel build //build/rpms I am including it cause I had to fix a reliance on a macro that isn't everywhere yet.

This change also adds conntrack as a dependency for kubelet and kubeadm.

Does this PR introduce a user-facing change?:

Add conntrack as a dependency of kubelet and kubeadm when building rpms and debs. Both require conntrack to handle cleanup of connections.

@detiber
Fix bazel //build/rpms
3ee10e9 
- Also update the kubernetes-cni requirement for both debs and rpms
  to match release packaging.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. labels Nov 29, 2018
@k8s-ci-robot
Copy link
Contributor

Hi @mauilion. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 29, 2018
@mauilion mauilion mentioned this pull request Nov 29, 2018
Merged
@mauilion
Copy link
Author

@luxas @detiber @dims Here is the change for kubernetes/kubernetes I also have
kubernetes/release#653
open to keep the 2 in sync.

@mauilion
Copy link
Author

mauilion commented Nov 29, 2018 •
edited

/sig cluster-lifecycle
/sig release

@k8s-ci-robot k8s-ci-robot added sig/release Categorizes an issue or PR as relevant to SIG Release. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 29, 2018
@mauilion mauilion mentioned this pull request Nov 29, 2018
Closed
luxas
luxas approved these changes Nov 29, 2018
View reviewed changes
Copy link
Member

@luxas luxas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mauilion! Note the dep should only be added to kubelet, because kubeadm doesn't need it directly, but recursively via the kubelet. This is the pattern for all the other deps you see there as well.
Thanks for sorting 👏!
/approve

build/rpms/kubeadm.spec Outdated Show resolved Hide resolved
build/debs/BUILD Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 29, 2018
@luxas
Copy link
Member

luxas commented Nov 29, 2018

/ok-to-test
/priority backlog

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 29, 2018
Add conntrack as a dependency of kubelet
2d7b386 
FIXES: kubernetes/kubeadm#1287

- This commit integrates the work of @jdetiber to fix bazel build
//build/rpms and also addresses an issue where not all common versions
of rpmbuild have the %{_sysctldir} macro.

- Since that macro points to /usr/lib/sysctl.d this commit just points
directly to that dir.

- This also adds conntrack as a dependency of kubelet for both rpm and
deb builds.

Signed-off-by: Duffie Cooley <dcooley@heptio.com>
@mauilion
Copy link
Author

@luxas Addressed the changes :)

@mauilion mauilion changed the title Add conntrack as a dependency of kube{let,adm} Add conntrack as a dependency of kubelet Nov 29, 2018
timothysc
timothysc suggested changes Nov 29, 2018
View reviewed changes
build/rpms/kubeadm.spec Show resolved Hide resolved
build/rpms/kubelet.spec Show resolved Hide resolved
timothysc
timothysc approved these changes Nov 29, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: luxas, mauilion, timothysc

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

@detiber
Copy link
Member

detiber commented Nov 29, 2018

/test pull-kubernetes-e2e-kops-aws

@timothysc
Copy link
Member

After conversing, we'll let this through to unblock local builders and try to tackle some broader packaging issues in the near term.

@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.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 08706ea into kubernetes:master Nov 30, 2018
mauilion pushed a commit to mauilion/kubernetes that referenced this pull request Dec 1, 2018
Bump the version of kubernetes-cni to 0.6.0
8e08cbc 
This will resolve the kubernetes-anywhere e2e test.
In commit: kubernetes#71540
I bumped the required version of kubernetes-cni to 0.6.0 but didn't
start packaging it. This resolve that.

Signed-off-by: Duffie Cooley <dcooley@heptio.com>
@mauilion mauilion mentioned this pull request Dec 1, 2018
Merged
@mauilion mauilion mentioned this pull request Mar 15, 2019
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timothysc timothysc timothysc approved these changes

@luxas luxas luxas approved these changes

@jbeda jbeda Awaiting requested review from jbeda

@mikedanese mikedanese Awaiting requested review from mikedanese

Assignees

@timothysc timothysc

@luxas luxas

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/release Categorizes an issue or PR as relevant to SIG Release. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Install conntrack as a deb/rpm dep?
6 participants
@mauilion @k8s-ci-robot @luxas @detiber @timothysc @fejta-bot