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

Add nmstate handler daemonset to operator #89

Merged
merged 2 commits into from
May 13, 2019
Merged

Add nmstate handler daemonset to operator #89

merged 2 commits into from
May 13, 2019

Conversation

sjpotter
Copy link
Contributor

per my email to kubevirt-dev, here's my work in progress to add the nmstate handler from kubernetes-nmstate repo to the operator.

still have to check into the manifests it builds to see if anything has to be added, but figure get the PR out early so general comments can be made if I didn't understand something of how its supposed to work.

@ovirt-infra
Copy link

Hello contributor, thanks for submitting a PR for this project!

I am the bot who triggers "standard-CI" builds for this project.
As a security measure, I will not run automated tests on PRs that are not from white-listed contributors.

In order to allow automated tests to run, please ask one of the project maintainers to review the code and then do one of the following:

  1. Type ci test please on this PR to trigger automated tests for it.
  2. Type ci add to whitelist on this PR to trigger automated tests for it and also add you to the contributor white-list so that your future PRs will be tested automatically. ( keep in mind this list might be overwritten if the job XML is refreshed, for permanent whitelisting, please follow need to change the deployment command #3 option )
  3. If you are planning to contribute to more than one project, maybe it's better to ask them to add you to the project organization, so you'll be able to run tests for all the organization's projects.

@kubevirt-bot kubevirt-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L labels Apr 24, 2019
Copy link
Contributor

@SchSeba SchSeba 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 contribution!

Just a few comments

data/nmstate/001-rbac Outdated Show resolved Hide resolved
data/nmstate/002-nmstated.yaml Outdated Show resolved Hide resolved
data/nmstate/002-nmstated.yaml Outdated Show resolved Hide resolved
data/nmstate/001-rbac Outdated Show resolved Hide resolved
data/nmstate/001-rbac Outdated Show resolved Hide resolved
data/nmstate/000-ns.yaml Outdated Show resolved Hide resolved
data/nmstate/002-nmstated.yaml Show resolved Hide resolved
pkg/components/components.go Outdated Show resolved Hide resolved
pkg/network/nmstate.go Outdated Show resolved Hide resolved
pkg/network/nmstate.go Outdated Show resolved Hide resolved
Copy link
Member

@phoracek phoracek left a comment

Choose a reason for hiding this comment

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

Just a nit, thanks for pushing this PR. Other than those 2 comments it looks good.

data/nmstate/002-nmstated.yaml Outdated Show resolved Hide resolved
pkg/network/nmstate.go Outdated Show resolved Hide resolved
Copy link
Contributor

@SchSeba SchSeba left a comment

Choose a reason for hiding this comment

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

I have another request can you add some documentation in the README file about nmstate(you can take it from the nmstate-kubernetes git repo)

@kubevirt-bot kubevirt-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 29, 2019
Copy link
Contributor

@SchSeba SchSeba left a comment

Choose a reason for hiding this comment

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

Looks good to me just a small nit and I think it is ready @phoracek what you think?

README.md Outdated Show resolved Hide resolved
cluster/functest.sh Outdated Show resolved Hide resolved
Copy link
Contributor

@SchSeba SchSeba left a comment

Choose a reason for hiding this comment

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

LGTM!
@phoracek you have any other request?

@sjpotter if there is an ack from @phoracek can you please squash the commits ?

phoracek
phoracek previously approved these changes May 1, 2019
@sjpotter
Copy link
Contributor Author

sjpotter commented May 1, 2019

do you guys want a form of history preserved in the squash or just what's basically the first message.

@phoracek
Copy link
Member

phoracek commented May 1, 2019

@sjpotter just the first one

@sjpotter sjpotter changed the title WIP: add nmstate handler daemonset to operator Add nmstate handler daemonset to operator May 1, 2019
@kubevirt-bot kubevirt-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 1, 2019
@sjpotter
Copy link
Contributor Author

sjpotter commented May 2, 2019

can't seem to figure out why github still has "changes requested".

@SchSeba
Copy link
Contributor

SchSeba commented May 3, 2019

@sjpotter sorry but we merge a PR can you please rebase on master and fix the conflict

@kubevirt-bot kubevirt-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 3, 2019
@SchSeba
Copy link
Contributor

SchSeba commented May 6, 2019

@sjpotter I still see a conflict problem can you please fix it?

@sjpotter
Copy link
Contributor Author

sjpotter commented May 6, 2019 via email

@kubevirt-bot kubevirt-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 9, 2019
@sjpotter
Copy link
Contributor Author

sjpotter commented May 9, 2019

the above / continued rebase issue is due to whitespace, so every time a new version of an image is comitted, I have to rebase, as my PR changes whitespace in all the images. I could insert a blank line in the consts, to avoid gofmt adding whitespace.

@phoracek
Copy link
Member

phoracek commented May 9, 2019

@sjpotter sorry about that. Let's wait for CI to pass and then I will merge.

phoracek
phoracek previously approved these changes May 9, 2019
@phoracek phoracek requested a review from SchSeba May 9, 2019 15:52
@phoracek
Copy link
Member

phoracek commented May 9, 2019

ci test please


// render the manifests on disk
data := render.MakeRenderData()
data.Data["NMStateStateHandlerImage"] = os.Getenv("NMSTATE_STATE_HANDLER_IMAGE")
Copy link
Contributor

Choose a reason for hiding this comment

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

related to CI error

status:
  conditions:
  - lastProbeTime: 2019-05-09T20:06:57Z
    lastTransitionTime: 2019-05-09T20:06:10Z
    message: 'failed to render: failed to render nmstate state handler manifests:
      error rendering manifests: failed to render manifest data/nmstate/002-nmstated.yaml:
      template: data/nmstate/002-nmstated.yaml:22:20: executing "data/nmstate/002-nmstated.yaml"
      at <.NMStateHandlerImage>: map has no entry for key "NMStateHandlerImage"'
    reason: FailedToRender
    status: "True"
    type: Failing
FAILED

can you please change here to

NMStateStateHandlerImage -> NMStateHandlerImage

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we said we wanted it to be verbosely named? unless the same image will be used for both controller and client?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've changed the template to be using the correct variable as defined in pkg/network/nmstate.go

@SchSeba
Copy link
Contributor

SchSeba commented May 11, 2019

ci tests please

@SchSeba
Copy link
Contributor

SchSeba commented May 11, 2019

ci test please

Copy link
Contributor

@SchSeba SchSeba left a comment

Choose a reason for hiding this comment

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

@SchSeba SchSeba merged commit 0074444 into kubevirt:master May 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants