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

Run nfd-master as Deployment #141

Merged

Conversation

ArangoGutierrez
Copy link
Contributor

Fixes #4

Also harden RBAC requested by the controller

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 13, 2022
@ArangoGutierrez
Copy link
Contributor Author

/cherry-pick release-0.4

@k8s-infra-cherrypick-robot

@ArangoGutierrez: once the present PR merges, I will cherry-pick it on top of release-0.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.4

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.

@marquiz
Copy link
Contributor

marquiz commented Apr 14, 2022

@ArangoGutierrez could the RBAC rule changes be split out into a separate PR? At least those that are not required by the Deployment change.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 14, 2022
Copy link
Contributor

@marquiz marquiz left a comment

Choose a reason for hiding this comment

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

Thanks @ArangoGutierrez. Some quick nits about the deployment files 😄

Makefile Outdated Show resolved Hide resolved
config/default/kustomization.yaml Outdated Show resolved Hide resolved
config/rbac/role.yaml Outdated Show resolved Hide resolved
controllers/nodefeaturediscovery_controls.go Outdated Show resolved Hide resolved
controllers/nodefeaturediscovery_controls.go Outdated Show resolved Hide resolved
controllers/nodefeaturediscovery_resources.go Outdated Show resolved Hide resolved
controllers/nodefeaturediscovery_status.go Show resolved Hide resolved
controllers/nodefeaturediscovery_status.go Outdated Show resolved Hide resolved
controllers/nodefeaturediscovery_status.go Show resolved Hide resolved
Copy link
Contributor

@marquiz marquiz left a comment

Choose a reason for hiding this comment

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

I don't think you should change config/rbac/role.yaml

@ArangoGutierrez ArangoGutierrez force-pushed the devel/rbac_hardening branch 2 times, most recently from 6ea2f98 to 695fcb5 Compare April 19, 2022 14:08
Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
Copy link
Contributor

@marquiz marquiz left a comment

Choose a reason for hiding this comment

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

Thanks @ArangoGutierrez! Looks good, now
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ArangoGutierrez, marquiz

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:
  • OWNERS [ArangoGutierrez,marquiz]

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 merged commit c8d3fd7 into kubernetes-sigs:master Apr 19, 2022
@k8s-infra-cherrypick-robot

@ArangoGutierrez: #141 failed to apply on top of branch "release-0.4":

Applying: Run nfd-master as Deployment
.git/rebase-apply/patch:110: trailing whitespace.
            weight: 1  
.git/rebase-apply/patch:118: trailing whitespace.
                fieldPath: spec.nodeName      
.git/rebase-apply/patch:130: trailing whitespace.
            runAsNonRoot: true  
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	config/manager/kustomization.yaml
A	config/manifests/bases/nfd-operator.clusterserviceversion.yaml
A	config/manifests/kustomization.yaml
M	config/rbac/role.yaml
M	controllers/nodefeaturediscovery_controller.go
M	controllers/nodefeaturediscovery_controls.go
M	controllers/nodefeaturediscovery_finalizers.go
M	controllers/nodefeaturediscovery_status.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/nodefeaturediscovery_status.go
Auto-merging controllers/nodefeaturediscovery_finalizers.go
Auto-merging controllers/nodefeaturediscovery_controls.go
Auto-merging controllers/nodefeaturediscovery_controller.go
Auto-merging config/rbac/role.yaml
CONFLICT (modify/delete): config/manifests/kustomization.yaml deleted in HEAD and modified in Run nfd-master as Deployment. Version Run nfd-master as Deployment of config/manifests/kustomization.yaml left in tree.
CONFLICT (modify/delete): config/manifests/bases/nfd-operator.clusterserviceversion.yaml deleted in HEAD and modified in Run nfd-master as Deployment. Version Run nfd-master as Deployment of config/manifests/bases/nfd-operator.clusterserviceversion.yaml left in tree.
Auto-merging config/manager/kustomization.yaml
CONFLICT (content): Merge conflict in config/manager/kustomization.yaml
Removing build/assets/master/0400_master_daemonset.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Run nfd-master as Deployment
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.4

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.

@ArangoGutierrez ArangoGutierrez mentioned this pull request Apr 19, 2022
@ArangoGutierrez ArangoGutierrez mentioned this pull request Apr 26, 2022
14 tasks
@ArangoGutierrez ArangoGutierrez added this to the v0.5.0 milestone May 17, 2022
@ArangoGutierrez ArangoGutierrez mentioned this pull request May 17, 2022
31 tasks
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

Run nfd-master as Deployment
5 participants