Skip to content

kubepkg: Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages #1330

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

Merged
merged 1 commit into from
Jun 2, 2020

Conversation

justaugustus
Copy link
Member

What type of PR is this?

/kind cleanup feature
/area dependency
/sig network

What this PR does / why we need it:

Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages

(Reverse backport... forward port(?) of #1309)
ref: #885, kubernetes/kubernetes#91370

Signed-off-by: Stephen Augustus [email protected]
cc: @kubernetes/release-engineering

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

WIP. There will be some broken tests on this one.

Does this PR introduce a user-facing change?

kubepkg: Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/dependency Issues or PRs related to dependency changes sig/network Categorizes an issue or PR as relevant to SIG Network. needs-priority size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 31, 2020
@k8s-ci-robot k8s-ci-robot requested review from hoegaarden and ps882 May 31, 2020 23:34
@k8s-ci-robot k8s-ci-robot added area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 31, 2020
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 1, 2020
@justaugustus justaugustus force-pushed the cni-update branch 3 times, most recently from 5a92478 to 16efa74 Compare June 1, 2020 07:40
@justaugustus justaugustus changed the title [WIP] kubepkg: Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages kubepkg: Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages Jun 2, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2020
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/lgtm

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

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/lgtm

@cpanato
Copy link
Member

cpanato commented Jun 2, 2020

/hold for others to review if needed

@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 Jun 2, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, hasheddan, 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

@cpanato
Copy link
Member

cpanato commented Jun 2, 2020

looks like not needed :)
/hold cancel

@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 Jun 2, 2020
@k8s-ci-robot k8s-ci-robot merged commit d992507 into kubernetes:master Jun 2, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jun 2, 2020

# TODO: Do we need this?
#%make_install

%files
%{_bindir}/kubelet
%{_unitdir}/kubelet.service
%{_sysconfdir}/kubernetes/manifests/
/opt/cni
Copy link
Member

Choose a reason for hiding this comment

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

As mentioned in #1309 (comment), I think we could discuss a better location than /opt

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/release Categorizes an issue or PR as relevant to SIG Release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants