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

feat: add master config file #1084

Merged
merged 1 commit into from
Apr 4, 2023
Merged

feat: add master config file #1084

merged 1 commit into from
Apr 4, 2023

Conversation

AhmedGrati
Copy link

Resolves #485.
Tasks done:

  • Support config file for the master, with fsnotify, config parsing, and overrides from command line flags
  • Unit Tests
  • Deployment (Kustomize, Helm, Update make templates) with the default configuration
  • Documentation (command line reference, config reference, nfd-master usage page)
  • E2E Tests

@netlify
Copy link

netlify bot commented Mar 12, 2023 •
edited
Loading

✅ Deploy Preview for kubernetes-sigs-nfd ready!

Name Link
🔨 Latest commit 3fff409
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-nfd/deploys/642a9585d8422e00089fe9c0
😎 Deploy Preview https://deploy-preview-1084--kubernetes-sigs-nfd.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 12, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @AhmedGrati. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 12, 2023
@AhmedGrati
Copy link
Author

/cc @marquiz

@k8s-ci-robot k8s-ci-robot requested a review from marquiz March 12, 2023 19:16
@marquiz
Copy link
Contributor

marquiz commented Mar 14, 2023

Thanks @AhmedGrati for the enhancement! I will look into this shortly
/ok-to-test
/assign @fmuyassarov @ArangoGutierrez @marquiz

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 14, 2023
marquiz
marquiz reviewed Mar 14, 2023
View reviewed changes
deployment/base/master/master-deployment.yaml Outdated Show resolved Hide resolved
deployment/components/common/kustomization.yaml Outdated Show resolved Hide resolved
docs/deployment/helm.md Outdated Show resolved Hide resolved
docs/reference/master-configuration-reference.md Show resolved Hide resolved
docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
docs/usage/nfd-master.md Outdated Show resolved Hide resolved
docs/usage/nfd-master.md Show resolved Hide resolved
deployment/components/master-config/nfd-master.conf.example Outdated Show resolved Hide resolved
pkg/nfd-master/nfd-master.go Show resolved Hide resolved
pkg/nfd-master/nfd-master.go Outdated Show resolved Hide resolved
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch 4 times, most recently from 0821d85 to 5360ccc Compare March 14, 2023 14:41
marquiz
marquiz reviewed Mar 14, 2023
View reviewed changes
deployment/base/master/master-deployment.yaml Outdated Show resolved Hide resolved
docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
docs/usage/nfd-master.md Outdated Show resolved Hide resolved
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch 3 times, most recently from d64fd8b to 346b838 Compare March 15, 2023 10:02
@AhmedGrati AhmedGrati requested review from marquiz and removed request for zvonkok and ArangoGutierrez March 15, 2023 10:09
@fmuyassarov
Copy link
Member

Thanks for working on this @AhmedGrati , I will give some time for the review by the end of the day.

marquiz
marquiz reviewed Mar 15, 2023
View reviewed changes
docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
docs/usage/nfd-master.md Outdated Show resolved Hide resolved
docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
test/e2e/node_feature_discovery_test.go Outdated Show resolved Hide resolved
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch 2 times, most recently from a7bd7c9 to 6c58637 Compare March 17, 2023 19:33
@AhmedGrati AhmedGrati mentioned this pull request Mar 17, 2023
Merged
@AhmedGrati AhmedGrati requested a review from marquiz March 18, 2023 14:00
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch 2 times, most recently from fcda8f4 to 0c9dc1b Compare March 20, 2023 19:28
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch from 0c9dc1b to 2158e9d Compare March 22, 2023 07:41
@AhmedGrati AhmedGrati requested a review from marquiz March 22, 2023 09:58
fmuyassarov
fmuyassarov reviewed Mar 22, 2023
View reviewed changes
Copy link
Member

@fmuyassarov fmuyassarov 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. Thanks @marquiz for helping reviewing and @AhmedGrati for the all work here.

docs/reference/master-configuration-reference.md Outdated Show resolved Hide resolved
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch 2 times, most recently from f5e5208 to 5ac2354 Compare April 1, 2023 14:49
@AhmedGrati AhmedGrati requested a review from marquiz April 1, 2023 14:56
marquiz
marquiz reviewed Apr 1, 2023
View reviewed changes
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 @AhmedGrati for the update! I think we're almost there, just a few more suggestions

test/e2e/node_feature_discovery_test.go Outdated Show resolved Hide resolved
test/e2e/node_feature_discovery_test.go Outdated Show resolved Hide resolved
test/e2e/node_feature_discovery_test.go Outdated Show resolved Hide resolved
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch from 5ac2354 to 26b99c9 Compare April 1, 2023 15:29
@AhmedGrati AhmedGrati requested a review from marquiz April 1, 2023 15:30
marquiz
marquiz reviewed Apr 3, 2023
View reviewed changes
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.

Nice work @AhmedGrati, for me the code looks good 👍

However, I have one more wish 😇 I only now looked at the commit message which is very brief (there is no message "body" whatsoever). Could you add a bit more flesh to it, explaining what is being added, see k8s commit msg guidelines

@TessaIO
Add master config file
3fff409 
Similar to the nfd-worker, in this PR we want to support the
dynamic run-time configurability through a config file for the nfd-master.

We'll use a json or yaml configuration file along with the fsnotify in
order to watch for changes in the config file. As a result, we're
allowing dynamic control of logging params, allowed namespaces,
extended resources, label whitelisting, and denied namespaces.

Signed-off-by: AhmedGrati <[email protected]>
@AhmedGrati AhmedGrati force-pushed the feat-add-master-config-file branch from 26b99c9 to 3fff409 Compare April 3, 2023 08:59
@AhmedGrati
Copy link
Author

@marquiz done.

@AhmedGrati AhmedGrati requested a review from marquiz April 3, 2023 09:18
marquiz
marquiz approved these changes Apr 3, 2023
View reviewed changes
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 @AhmedGrati! To me this now looks good to go

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2023
@marquiz
Copy link
Contributor

marquiz commented Apr 3, 2023

/assign @ArangoGutierrez

@marquiz
Copy link
Contributor

marquiz commented Apr 4, 2023

@ArangoGutierrez @zvonkok wanna check this one?

ArangoGutierrez
ArangoGutierrez approved these changes Apr 4, 2023
View reviewed changes
Copy link
Contributor

@ArangoGutierrez ArangoGutierrez left a comment

Choose a reason for hiding this comment

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

/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 4, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ec6a6a356de0b53d5cb0a52a2ce67613dc5d66fd

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AhmedGrati, 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:

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 193c552 into kubernetes-sigs:master Apr 4, 2023
@AhmedGrati AhmedGrati mentioned this pull request Apr 11, 2023
Closed
9 tasks
@marquiz marquiz mentioned this pull request Apr 12, 2023
Closed
24 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmuyassarov fmuyassarov fmuyassarov left review comments

@ArangoGutierrez ArangoGutierrez ArangoGutierrez approved these changes

@marquiz marquiz marquiz approved these changes

Assignees

@ArangoGutierrez ArangoGutierrez

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Config file for nfd-master
6 participants
@AhmedGrati @k8s-ci-robot @marquiz @fmuyassarov @ArangoGutierrez @TessaIO