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

Add conntrack as a dependency of kubelet #71540

Merged
merged 2 commits into from Nov 30, 2018

Conversation

@mauilion
Copy link
Contributor

mauilion commented Nov 29, 2018

/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.
Fix bazel //build/rpms
- Also update the kubernetes-cni requirement for both debs and rpms
  to match release packaging.
@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 29, 2018

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.

@mauilion

This comment has been minimized.

Copy link
Contributor Author

mauilion commented Nov 29, 2018

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

@mauilion

This comment has been minimized.

Copy link
Contributor Author

mauilion commented Nov 29, 2018

/sig cluster-lifecycle
/sig release

@mauilion mauilion force-pushed the mauilion:kubeadm_1287 branch from 4e02910 to dc725b7 Nov 29, 2018

@mauilion mauilion referenced this pull request Nov 29, 2018

Closed

Fix bazel //build/rpms #71475

@luxas

luxas approved these changes Nov 29, 2018

Copy link
Member

luxas left a comment

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

Show resolved Hide resolved build/rpms/kubeadm.spec Outdated
Show resolved Hide resolved build/debs/BUILD Outdated
@luxas

This comment has been minimized.

Copy link
Member

luxas commented Nov 29, 2018

/ok-to-test
/priority backlog

Add conntrack as a dependency of kubelet
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 mauilion force-pushed the mauilion:kubeadm_1287 branch from dc725b7 to 2d7b386 Nov 29, 2018

@mauilion

This comment has been minimized.

Copy link
Contributor Author

mauilion commented Nov 29, 2018

@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

Show resolved Hide resolved build/rpms/kubeadm.spec
Show resolved Hide resolved build/rpms/kubelet.spec
@timothysc
Copy link
Member

timothysc left a comment

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label Nov 29, 2018

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 29, 2018

[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

This comment has been minimized.

Copy link
Member

detiber commented Nov 29, 2018

/test pull-kubernetes-e2e-kops-aws

@timothysc

This comment has been minimized.

Copy link
Member

timothysc commented Nov 29, 2018

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

This comment has been minimized.

Copy link

fejta-bot commented Nov 30, 2018

/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

18 checks passed

cla/linuxfoundation mauilion authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
tide In merge pool.
Details

mauilion added a commit to mauilion/kubernetes that referenced this pull request Dec 1, 2018

Bump the version of kubernetes-cni to 0.6.0
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>

globervinodhn added a commit to globervinodhn/kubernetes that referenced this pull request Jan 10, 2019

Bump the version of kubernetes-cni to 0.6.0
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>

phenixblue added a commit to phenixblue/kubernetes that referenced this pull request Jan 24, 2019

Bump the version of kubernetes-cni to 0.6.0
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment