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

Update multus version & crio conf #6444

Merged
merged 1 commit into from
Jul 27, 2020
Merged

Update multus version & crio conf #6444

merged 1 commit into from
Jul 27, 2020

Conversation

floryut
Copy link
Member

@floryut floryut commented Jul 22, 2020

What type of PR is this?
/kind feature

What this PR does / why we need it:
Update multus cni to latest version

Which issue(s) this PR fixes:
None

Special notes for your reviewer:
I've update cni path for crio as I think it's outdated ? every references fond for crio now default to /opt/cni/bin

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added the kind/feature Categorizes issue or PR as related to a new feature. label Jul 22, 2020
@k8s-ci-robot k8s-ci-robot requested review from EppO and holmsten July 22, 2020 12:50
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 22, 2020
@floryut
Copy link
Member Author

floryut commented Jul 22, 2020

Package packet_centos7-multus-calicomanually triggered and green

oomichi
oomichi reviewed Jul 22, 2020
View reviewed changes
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

/cc @oomichi

roles/network_plugin/multus/defaults/main.yml
@@ -1,7 +1,7 @@
---
multus_conf_file: "auto"
multus_cni_conf_dir_host: "/etc/cni/net.d"
multus_cni_bin_dir_host: "{{ '/usr/libexec/cni' if container_manager == 'crio' else '/opt/cni/bin' }}"
Copy link
Contributor

Choose a reason for hiding this comment

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

@crandles Could you take a look at this change?
This part came from #5701 and this reverts it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I was basing my changes off of this: https://github.com/intel/multus-cni/blob/c85b79f5ff5bcacaa45e2135d29e9afb6b84ed9b/images/multus-daemonset-crio.yml#L166-L198 but agree it doesn't look necessary at this time

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, didn't think that was a recent change, but not sure it is ndeeded but you tell me (well as you approved the changes I guess you're fine with it)

@k8s-ci-robot k8s-ci-robot requested a review from oomichi July 22, 2020 19:11
@EppO
Copy link
Contributor

EppO commented Jul 23, 2020

/lgtm

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

Miouge1 commented Jul 27, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, Miouge1

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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 27, 2020
@k8s-ci-robot k8s-ci-robot merged commit c9f63e5 into kubernetes-sigs:master Jul 27, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Jul 29, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
9a7dcdc 
* 'master' of https://github.com/kubernetes-sigs/kubespray:
  Documentation for Ingress (kubernetes-sigs#6378)
  Fix ansible-lint E301 for commands fetching data (kubernetes-sigs#6465)
  Fix shellcheck url (kubernetes-sigs#6462)
  Fix ansible-lint E305 (kubernetes-sigs#6459)
  Fix ansible-lint E404 (kubernetes-sigs#6417)
  Update README.md and openstack.md (kubernetes-sigs#6455)
  Add noqa and disable .ansible-lint global exclusions (kubernetes-sigs#6410)
  Move healthz check to secure ports (kubernetes-sigs#6446)
  Update multus version & crio conf (kubernetes-sigs#6444)
  Fix remove etcd broken with etcdctl_api 3 (kubernetes-sigs#6448)
  update cinder csi manifests (kubernetes-sigs#6434)
  Update docker package to 19.03.12 (kubernetes-sigs#6439)
  * add proxy_env definition to remove_node.yml resolving kubernetes-sigs#6430 (kubernetes-sigs#6431)
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Sep 17, 2020
@floryut @LuckySB
Update multus version & crio conf (kubernetes-sigs#6444)
36b4070
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crandles crandles crandles approved these changes

@EppO EppO Awaiting requested review from EppO

@holmsten holmsten Awaiting requested review from holmsten

@oomichi oomichi Awaiting requested review from oomichi

Assignees

@EppO EppO

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/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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@floryut @EppO @Miouge1 @k8s-ci-robot @crandles @oomichi