Skip to content

cmd/openshift-sdn: Allow user-specified CNI configuration files#22898

Closed
squeed wants to merge 1 commit intoopenshift:masterfrom
squeed:sdn-config-template
Closed

cmd/openshift-sdn: Allow user-specified CNI configuration files#22898
squeed wants to merge 1 commit intoopenshift:masterfrom
squeed:sdn-config-template

Conversation

@squeed
Copy link
Contributor

@squeed squeed commented May 23, 2019

This lets us specify the exact CNI configuration file we want, but still only writes it when the network is ready.

@squeed squeed requested a review from dcbw May 23, 2019 16:57
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 23, 2019
@squeed
Copy link
Contributor Author

squeed commented May 23, 2019

/hold wip
This should be fine, but I haven't had a chance to test it. Plus, we need to tweak the MCD tempfiles.

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 23, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: squeed

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2019
@squeed
Copy link
Contributor Author

squeed commented May 23, 2019

/hold
After this merges, we'll updated the manifests in the network operator.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 23, 2019
@squeed
cmd/openshift-sdn: Allow user-specified CNI configuration files
1ef3f31 
This lets us specify the exact CNI configuration file we want, but still
only writes it when the network is ready.
@squeed
Copy link
Contributor Author

squeed commented May 24, 2019

Bah, it failed tests because the file path is the readiness probe. Can't change that.

@squeed
Copy link
Contributor Author

squeed commented May 24, 2019

Test failures seem like a rebase issue. Race detector triggered on some upstream code.

@squeed
Copy link
Contributor Author

squeed commented May 24, 2019

/retest

@squeed squeed mentioned this pull request May 24, 2019
Closed
@squeed
Copy link
Contributor Author

squeed commented May 24, 2019

/retest

@squeed
Copy link
Contributor Author

squeed commented May 27, 2019

Weird, ovs failed to come up in the last upgrade run. That shouldn't have anything to do with this PR, but it's unsettling...

@squeed
Copy link
Contributor Author

squeed commented May 27, 2019

/retest

@jsafrane jsafrane mentioned this pull request May 28, 2019
Merged
dcbw
dcbw reviewed May 28, 2019
View reviewed changes
pkg/cmd/openshift-sdn/cmd.go

cniConfDir := "/etc/cni/net.d"
if val, ok := sdn.NodeConfig.KubeletArguments["cni-conf-dir"]; ok && len(val) == 1 {
cniConfDir = val[0]
Copy link
Contributor

@dcbw dcbw May 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@squeed so we're dropping the enforced same CNI configdir path between kubelet and the SDN and just making sure we manage that manually through the daemonset YAML via host mounts now? Which is fine, just want to be sure.

Copy link
Contributor Author

@squeed squeed May 29, 2019

Choose a reason for hiding this comment

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

basically, yes - given that NodeConfig doesn't exist anyways.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 13, 2019

@squeed: PR needs rebase.

Details

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.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 13, 2019
@squeed squeed closed this Jun 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@dcbw dcbw dcbw left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@squeed @openshift-ci-robot @dcbw