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

operator: move most of discover pod setting to cm #12691

Merged
merged 1 commit into from
Aug 16, 2023

Conversation

subhamkrai
Copy link
Contributor

@subhamkrai subhamkrai commented Aug 9, 2023

Description of your changes:

operator: move most of discover pod setting to cm

It's better to move most of discover daemon setting
from env to configmap rook-ceph-operator-config.

  • Testing

Which issue is resolved by this Pull Request:
Resolves #12651

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide.
  • Skip Tests for Docs: If this is only a documentation change, add the label skip-ci on the PR.
  • Reviewed the developer guide on Submitting a Pull Request
  • Pending release notes updated with breaking and/or notable changes for the next minor release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

pkg/operator/discover/discover.go Outdated Show resolved Hide resolved
pkg/operator/discover/discover.go Show resolved Hide resolved
@subhamkrai subhamkrai force-pushed the operator-placement branch 2 times, most recently from 27026ae to 7385048 Compare August 16, 2023 09:30
@subhamkrai subhamkrai changed the title operator: discovery daemon setting moved in configmap operator: move most of discover pod setting to cm Aug 16, 2023
@subhamkrai
Copy link
Contributor Author

subhamkrai commented Aug 16, 2023

Tested with few settings

# added toleration from
023-08-16 08:46:09.325812 I | op-k8sutil: DISCOVER_TOLERATIONS="- effect: NoSchedule\n  key: hostname\n  operator: Equal\n  value: minikube\n" (configmap)
2023-08-16 08:46:09.325921 I | op-discover: tolerations: [{hostname Equal minikube NoSchedule <nil>}]
# Also, disabled discover pod from cm
2023-08-16 09:26:43.744031 I | op-k8sutil: ROOK_ENABLE_DISCOVERY_DAEMON="false" (configmap)

@subhamkrai subhamkrai marked this pull request as ready for review August 16, 2023 09:32
Copy link
Contributor Author

@subhamkrai subhamkrai left a comment

Choose a reason for hiding this comment

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

@travisn do I need to modify settings for helm chart also,? currently, I don't see discover pod settings in helm settings so I have not added yet.

@travisn
Copy link
Member

travisn commented Aug 16, 2023

@travisn do I need to modify settings for helm chart also,? currently, I don't see discover pod settings in helm settings so I have not added yet.

The helm settings for discovery settings are in the helm chart, just in the env vars. We can leave them in the env vars too for now in the helm chart.

pkg/operator/discover/discover.go Outdated Show resolved Hide resolved
It's better to move most of discover daemon setting
from env to configmap rook-ceph-operator-config.
Although, we are moving to configmap, we keep reading settings
from env but the priority will be configmap settings.

Signed-off-by: subhamkrai <srai@redhat.com>
@travisn travisn merged commit 29f984d into rook:master Aug 16, 2023
45 of 49 checks passed
travisn added a commit that referenced this pull request Sep 7, 2023
operator: move most of discover pod setting to cm (backport #12691)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Please implement discovery node affinity and tolerations in configmap for the operator
2 participants