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.

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

create multus kubeconfig for in case of non auto flag. #1317

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

adrianchiris
Copy link
Contributor

@adrianchiris adrianchiris commented Aug 1, 2024

This is a small rework of PR#1302 to reduce code changes for test.

Fixes #1295

@coveralls
Copy link

Coverage Status

coverage: 64.138% (+1.5%) from 62.667%
when pulling ca21ef6 on adrianchiris:pr-1302-update
into b11ea82 on k8snetworkplumbingwg:master.

@adrianchiris
Copy link
Contributor Author

This PR is based on #1302 , after rebase on master and some streamlining of the test to reduce code changes in thin_entrypoint.

@adrianchiris
Copy link
Contributor Author

@dougbtv PTAL

Copy link
Member

@dougbtv dougbtv left a comment

Choose a reason for hiding this comment

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

thanks for the rework Adrian!

"testing"

. "github.com/onsi/ginkgo/v2" //nolint:golint
. "github.com/onsi/gomega" //nolint:golint
)

// chrootTestHelper performs chroot syscall, returns func to get back to original root or error if occurred
func chrootTestHelper(path string) (func() error, error) {
Copy link
Member

Choose a reason for hiding this comment

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

smart!

@@ -585,6 +585,11 @@ func main() {
var masterConfigFilePath string
// copy user specified multus conf to CNI conf directory
if opt.MultusConfFile != "auto" {
caHash, saTokenHash, err = opt.createKubeConfig(nil, nil)
Copy link
Member

Choose a reason for hiding this comment

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

nice and efficient.

@dougbtv dougbtv merged commit b901901 into k8snetworkplumbingwg:master Aug 1, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

thin_entrypoint should generate multus kubeconfig with manual option
4 participants