fix: Add validation method for controller and crd's #5476
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slashpai
force-pushed
the
agent_validation
branch
from
c3be907
to
ba459cc
Compare
slashpai
force-pushed
the
agent_validation
branch
6 times, most recently
from
28bc095
to
5118fee
Compare
|
We won't be able to move suggestions? |
slashpai
commented
Apr 13, 2023
|
@simonpasquier Can you review when you get chance? |
5 tasks
slashpai
force-pushed
the
agent_validation
branch
from
5118fee
to
38693c9
Compare
|
Making a few changes hence moving to draft |
slashpai
force-pushed
the
agent_validation
branch
3 times, most recently
from
b15d356
to
7b442fa
Compare
slashpai
commented
Apr 19, 2023
| @@ -282,25 +281,6 @@ func New(ctx context.Context, conf operator.Config, logger log.Logger, r prometh | |||
|
|
|||
| // Run the controller. | |||
| func (c *Operator) Run(ctx context.Context) error { | |||
| crdInstalled, err := k8sutil.IsAPIGroupVersionResourceSupported(c.kclient.Discovery(), monitoringv1alpha1.SchemeGroupVersion.String(), monitoringv1alpha1.PrometheusAgentName) | |||
There was a problem hiding this comment.
Moved to k8sutil.CheckPrerequisites()
slashpai
commented
Apr 19, 2023
| @@ -1332,44 +1312,3 @@ func (c *Operator) handleMonitorNamespaceUpdate(oldo, curo interface{}) { | |||
| ) | |||
| } | |||
| } | |||
|
|
|||
| // getMissingPermissions returns the RBAC permissions that the controller would need to be | |||
slashpai
force-pushed
the
agent_validation
branch
from
7b442fa
to
49bf8bc
Compare
slashpai
changed the title
slashpai
force-pushed
the
agent_validation
branch
from
49bf8bc
to
cec6ea3
Compare
|
@simonpasquier @JoaoBraveCoding This should be good to review again :) |
slashpai
force-pushed
the
agent_validation
branch
2 times, most recently
from
37f73c8
to
da926b9
Compare
|
Addressed comments and few more fixes :) |
slashpai
force-pushed
the
agent_validation
branch
3 times, most recently
from
d6cfa5f
to
a033063
Compare
|
@JoaoBraveCoding @simonpasquier are we good with the changes? :) |
slashpai
force-pushed
the
agent_validation
branch
2 times, most recently
from
3087946
to
91a52d6
Compare
slashpai
force-pushed
the
agent_validation
branch
2 times, most recently
from
31cb711
to
5086dfa
Compare
method `CheckPrerequisites()` to avoid creating controller object incase of validation failure. This is used for prometheus-agent controller as part of this commit. These methods can be re-used for future CRD validation and controllers Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
slashpai
force-pushed
the
agent_validation
branch
from
5086dfa
to
096c4c2
Compare
|
@simonpasquier updated 🤞🏻 |
simonpasquier
approved these changes
Apr 27, 2023
|
thanks! |
|
How can I add permission to prometheus agent CRD ? I installed using helm. |
The necessary permissions can be seen here. I'm not really familiar how to do so using helm. Maybe it's worth asking at the helm repository? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move controller creation pre-requisites to validation method
CheckPrerequisites()to avoid creatingcontroller object incase of validation failure. This is used for prometheus-agent controller as part of
this commit. These methods can be re-used for future CRD validation
and controllers
This change is result of alert fired during e2e test for prometheus-operator version upgrade in ocp openshift#223.
PrometheusOperatorNotReadywas fired forprometheus-agentcontroller since CRD was not installed. Same alert will fire for upstream users who doesn't install prometheus-agent crd. This commit creates agent controller object only when validations are met.Description
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.