MON-3902: add initial Monitoring CRD api by marioferh · Pull Request #1929 · openshift/api

marioferh · 2024-06-12T12:03:33Z

Initial Implementation of Configuration CRD for the Cluster Monitoring Operator

Related: Enhancements Proposal [link]

As we have a FeatureGate, the idea is to implement component by component to verify the correct behavior and facilitate the reviews.

The API comes from https://github.com/openshift/cluster-monitoring-operator/blob/7015893ece5ed0a6f888fffe09b6d10a807d6901/pkg/manifests/config.go#L51

openshift-ci · 2024-06-12T12:04:05Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci · 2024-06-12T12:04:12Z

Hello @marioferh! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

openshift-ci-robot · 2024-06-12T16:38:17Z

@marioferh: This pull request references MON-3902 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.17.0" version, but no target version was set.

Details

In response to this:

Initial Implementation of Configuration CRD for the Cluster Monitoring Operator

Related: [link]

As we have a FeatureGate, the idea is to implement component by component to verify the correct behavior and facilitate the reviews.

The API comes from https://github.com/openshift/cluster-monitoring-operator/blob/7015893ece5ed0a6f888fffe09b6d10a807d6901/pkg/manifests/config.go#L51

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 openshift-eng/jira-lifecycle-plugin repository.

marioferh · 2024-07-01T10:08:25Z

/retest-required

JoelSpeed · 2024-07-02T12:41:07Z

/test e2e-upgrade-minor

marioferh · 2024-07-03T07:28:38Z

/retest-required

jan--f

Some changes are needed here. I added a couple of suggestions as well. While we will go over this when things move to v1 once more in detail, it's worth getting details right from the get go too I think.

JoelSpeed

Please review the linter issues and resolve those, in particular, lots of fields aren't marked either as optional or required, they will need to be updated.

Try make lint-fix to help where some issues can be auto-fixed

JoelSpeed · 2024-12-15T11:38:18Z

+// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1929
+// +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=clustermonitoring,scope=Cluster


Ok, so if I'm reading the last few comments correctly, we are happy to proceed with this design as is, and will create a new abstraction at the HostedCluster level for HCP relevant parts of monitoring the management side

marioferh · 2024-12-17T09:55:30Z

/retest

JoelSpeed · 2024-12-17T10:21:58Z

From the linter, these ones should be fixed. The first four WRT empty json tag is a bug that I'll fix this afternoon

config/v1/types_cluster_monitoring.go:63:2: optionalorrequired: field Items must be marked as optional or required (kal)
	Items []ClusterMonitoring `json:"items"`
	^
config/v1/types_cluster_monitoring.go:[45](https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_api/1929/pull-ci-openshift-api-master-lint/1868744969225768960#1:build-log.txt%3A45):2: requiredfields: field Spec is marked as required, but has the omitempty tag (kal)
	Spec ClusterMonitoringSpec `json:"spec,omitempty"`
	^
config/v1/types_cluster_monitoring.go:70:2: requiredfields: field UserDefined is marked as required, but has the omitempty tag (kal)
	UserDefined UserDefinedMonitoring `json:"userDefined,omitempty"`
	^
config/v1/types_cluster_monitoring.go:81:2: requiredfields: field Mode is marked as required, but has the omitempty tag (kal)
	Mode UserDefinedMode `json:"mode,omitempty"`
	^

JoelSpeed

Couple of nits, plus the linter fixes and I think this is good to go

Add UserDefinedMonitoring Add tests Add FeatureGate generate files Signed-off-by: Mario Fernandez <mariofer@redhat.com>

JoelSpeed · 2024-12-18T11:01:59Z

Changes LGTM, waiting on a linter fix to merge to verify a green lint, and then we can get this merged

In the mean time, will double check on EP updates

JoelSpeed · 2024-12-18T16:16:02Z

/test lint

marioferh · 2024-12-19T08:17:10Z

/retest-required

marioferh · 2024-12-19T09:29:01Z

/test okd-scos-e2e-aws-ovn

jan--f

/lgtm

JoelSpeed · 2024-12-19T14:34:28Z

/lgtm

openshift-ci · 2024-12-19T14:35:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, JoelSpeed, marioferh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [JoelSpeed]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

marioferh · 2024-12-20T08:25:09Z

/retest-required

JoelSpeed · 2024-12-20T13:08:30Z

/label acknowledge-critical-fixes-only

This only affects the payload in adding a new techpreview CRD. @marioferh is continuing to work on this feature over shutdown, and not having this merged is a blocker for him. I believe this is sufficiently low enough risk to merge even under the critical fixes label

openshift-ci-robot · 2024-12-20T13:30:44Z

/retest-required

Remaining retests: 0 against base HEAD b88d067 and 2 for PR HEAD 80c3c40 in total

marioferh · 2024-12-22T18:28:51Z

/retest

openshift-bot · 2024-12-23T09:48:32Z

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.19.0-202412230909.p0.g188620a.assembly.stream.el9.
All builds following this will include this PR.

marioferh marked this pull request as ready for review June 12, 2024 12:03

marioferh changed the title ~~WIP; add initial ClusterMonitoring CRD api~~ WIP: add initial ClusterMonitoring CRD api Jun 12, 2024

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 12, 2024

openshift-ci Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 12, 2024

openshift-ci Bot requested review from derekwaynecarr and knobunc June 12, 2024 12:06

marioferh force-pushed the initial_cmo_api branch from f5c996c to 7ff5883 Compare June 12, 2024 16:32

marioferh commented Jun 12, 2024

View reviewed changes

Comment thread config/v1/types_cmo.go Outdated

marioferh changed the title ~~WIP: add initial ClusterMonitoring CRD api~~ MON-3902: add initial ClusterMonitoring CRD api Jun 12, 2024

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 12, 2024

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 12, 2024

marioferh force-pushed the initial_cmo_api branch 3 times, most recently from 9603c29 to 9c70852 Compare June 12, 2024 17:14

marioferh commented Jun 14, 2024

View reviewed changes

Comment thread config/v1/types_cmo.go Outdated

marioferh force-pushed the initial_cmo_api branch from 9c70852 to 7ad01c2 Compare June 18, 2024 08:02

marioferh changed the title ~~MON-3902: add initial ClusterMonitoring CRD api~~ MON-3902: add initial Monitoring CRD api Jun 18, 2024

simonpasquier reviewed Jun 19, 2024

View reviewed changes

Comment thread config/v1/types_monitoring.go Outdated

Comment thread config/v1/types_monitoring.go Outdated

Comment thread config/v1/types_monitoring.go Outdated

Comment thread config/v1/types_monitoring.go Outdated

simonpasquier reviewed Jun 19, 2024

View reviewed changes

Comment thread config/v1/types_monitoring.go Outdated

marioferh force-pushed the initial_cmo_api branch from 9cef41b to dd98b0c Compare June 20, 2024 09:48

marioferh force-pushed the initial_cmo_api branch from acd1f91 to 905b2a2 Compare June 27, 2024 14:32

marioferh force-pushed the initial_cmo_api branch from 905b2a2 to d5ac7cc Compare July 2, 2024 15:38

jan--f suggested changes Jul 5, 2024

View reviewed changes

marioferh force-pushed the initial_cmo_api branch from 6508ce9 to 57616ed Compare July 8, 2024 07:51

enxebre reviewed Dec 2, 2024

View reviewed changes

Comment thread config/v1/types_cluster_monitoring.go

JoelSpeed reviewed Dec 15, 2024

View reviewed changes

marioferh force-pushed the initial_cmo_api branch from 1a1bee7 to 6884e3e Compare December 16, 2024 19:47

JoelSpeed reviewed Dec 17, 2024

View reviewed changes

Comment thread config/v1/types_cluster_monitoring.go Outdated

Comment thread config/v1/types_cluster_monitoring.go

marioferh force-pushed the initial_cmo_api branch 2 times, most recently from 5407e51 to a4ec8a2 Compare December 17, 2024 14:22

add initial Monitoring CRD api

80c3c40

Add UserDefinedMonitoring Add tests Add FeatureGate generate files Signed-off-by: Mario Fernandez <mariofer@redhat.com>

marioferh force-pushed the initial_cmo_api branch from a4ec8a2 to 80c3c40 Compare December 18, 2024 09:24

jan--f approved these changes Dec 19, 2024

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2024

openshift-ci Bot assigned JoelSpeed Dec 19, 2024

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 19, 2024

openshift-ci Bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Dec 20, 2024

openshift-merge-bot Bot merged commit 188620a into openshift:master Dec 22, 2024

marioferh mentioned this pull request Jan 15, 2025

MON-4025: Add AlertmanagerMainConfig #2148

Merged

marioferh mentioned this pull request May 15, 2025

MON-4028: Add Metric server config #2322

Merged

coderabbitai Bot mentioned this pull request Nov 19, 2025

OCPNODE-3863: Add CRIOCredentialProviderConfig API #2557

Merged

Uh oh!

Conversation

marioferh commented Jun 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Jun 12, 2024

Uh oh!

openshift-ci Bot commented Jun 12, 2024

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 12, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

marioferh commented Jul 1, 2024

Uh oh!

JoelSpeed commented Jul 2, 2024

Uh oh!

marioferh commented Jul 3, 2024

Uh oh!

jan--f left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JoelSpeed left a comment

Choose a reason for hiding this comment

Uh oh!

JoelSpeed Dec 15, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

marioferh commented Dec 17, 2024

Uh oh!

JoelSpeed commented Dec 17, 2024

Uh oh!

JoelSpeed left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JoelSpeed commented Dec 18, 2024

Uh oh!

JoelSpeed commented Dec 18, 2024

Uh oh!

marioferh commented Dec 19, 2024

Uh oh!

marioferh commented Dec 19, 2024

Uh oh!

jan--f left a comment

Choose a reason for hiding this comment

Uh oh!

JoelSpeed commented Dec 19, 2024

Uh oh!

openshift-ci Bot commented Dec 19, 2024

Uh oh!

marioferh commented Dec 20, 2024

Uh oh!

JoelSpeed commented Dec 20, 2024

Uh oh!

openshift-ci-robot commented Dec 20, 2024

Uh oh!

marioferh commented Dec 22, 2024

Uh oh!

openshift-bot commented Dec 23, 2024

marioferh commented Jun 12, 2024 •

edited

Loading

openshift-ci-robot commented Jun 12, 2024 •

edited by openshift-ci Bot

Loading