Skip to content

Commit 6d757d5

Browse files
committed
MON-4359: Add Monitoring Capability
Add an "OptionalMonitoring" capability to support optional monitoring. Signed-off-by: Pranshu Srivastava <[email protected]>
1 parent a638ff2 commit 6d757d5

File tree

1 file changed

+64
-1
lines changed

1 file changed

+64
-1
lines changed

config/v1/types_cluster_version.go

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ const (
278278
)
279279

280280
// ClusterVersionCapability enumerates optional, core cluster components.
281-
// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager;OperatorLifecycleManagerV1
281+
// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager;OperatorLifecycleManagerV1;OptionalMonitoring
282282
type ClusterVersionCapability string
283283

284284
const (
@@ -399,6 +399,15 @@ const (
399399
// Managers deployed on top of OpenShift. They help you to work with cloud
400400
// provider API and embeds cloud-specific control logic.
401401
ClusterVersionCapabilityCloudControllerManager ClusterVersionCapability = "CloudControllerManager"
402+
403+
// ClusterVersionCapabilityOptionalMonitoring manages the cluster monitoring stack which is responsible for gathering and
404+
// processing metrics from the in-house and user workloads. The following CRDs are constitute this capability:
405+
// - TODO
406+
//
407+
// WARNING: This capability will drop all aforementioned CRDs, and may operational issues in the cluster.
408+
// The only supported use-case for this capability is to reduce the monitoring stack's resource usage by only
409+
// supporting telemetry.
410+
ClusterVersionCapabilityOptionalMonitoring ClusterVersionCapability = "OptionalMonitoring"
402411
)
403412

404413
// KnownClusterVersionCapabilities includes all known optional, core cluster components.
@@ -420,6 +429,7 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{
420429
ClusterVersionCapabilityCloudCredential,
421430
ClusterVersionCapabilityIngress,
422431
ClusterVersionCapabilityCloudControllerManager,
432+
ClusterVersionCapabilityOptionalMonitoring,
423433
}
424434

425435
// ClusterVersionCapabilitySet defines sets of cluster version capabilities.
@@ -479,6 +489,18 @@ const (
479489
// version of OpenShift is installed.
480490
ClusterVersionCapabilitySet4_18 ClusterVersionCapabilitySet = "v4.18"
481491

492+
// ClusterVersionCapabilitySet4_19 is the recommended set of
493+
// optional capabilities to enable for the 4.18 version of
494+
// OpenShift. This list will remain the same no matter which
495+
// version of OpenShift is installed.
496+
ClusterVersionCapabilitySet4_19 ClusterVersionCapabilitySet = "v4.19"
497+
498+
// ClusterVersionCapabilitySet4_20 is the recommended set of
499+
// optional capabilities to enable for the 4.18 version of
500+
// OpenShift. This list will remain the same no matter which
501+
// version of OpenShift is installed.
502+
ClusterVersionCapabilitySet4_20 ClusterVersionCapabilitySet = "v4.20"
503+
482504
// ClusterVersionCapabilitySetCurrent is the recommended set
483505
// of optional capabilities to enable for the cluster's
484506
// current version of OpenShift.
@@ -600,6 +622,46 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
600622
ClusterVersionCapabilityIngress,
601623
ClusterVersionCapabilityCloudControllerManager,
602624
},
625+
ClusterVersionCapabilitySet4_19: {
626+
ClusterVersionCapabilityBaremetal,
627+
ClusterVersionCapabilityConsole,
628+
ClusterVersionCapabilityInsights,
629+
ClusterVersionCapabilityMarketplace,
630+
ClusterVersionCapabilityStorage,
631+
ClusterVersionCapabilityOpenShiftSamples,
632+
ClusterVersionCapabilityCSISnapshot,
633+
ClusterVersionCapabilityNodeTuning,
634+
ClusterVersionCapabilityMachineAPI,
635+
ClusterVersionCapabilityBuild,
636+
ClusterVersionCapabilityDeploymentConfig,
637+
ClusterVersionCapabilityImageRegistry,
638+
ClusterVersionCapabilityOperatorLifecycleManager,
639+
ClusterVersionCapabilityOperatorLifecycleManagerV1,
640+
ClusterVersionCapabilityCloudCredential,
641+
ClusterVersionCapabilityIngress,
642+
ClusterVersionCapabilityCloudControllerManager,
643+
ClusterVersionCapabilityOptionalMonitoring,
644+
},
645+
ClusterVersionCapabilitySet4_20: {
646+
ClusterVersionCapabilityBaremetal,
647+
ClusterVersionCapabilityConsole,
648+
ClusterVersionCapabilityInsights,
649+
ClusterVersionCapabilityMarketplace,
650+
ClusterVersionCapabilityStorage,
651+
ClusterVersionCapabilityOpenShiftSamples,
652+
ClusterVersionCapabilityCSISnapshot,
653+
ClusterVersionCapabilityNodeTuning,
654+
ClusterVersionCapabilityMachineAPI,
655+
ClusterVersionCapabilityBuild,
656+
ClusterVersionCapabilityDeploymentConfig,
657+
ClusterVersionCapabilityImageRegistry,
658+
ClusterVersionCapabilityOperatorLifecycleManager,
659+
ClusterVersionCapabilityOperatorLifecycleManagerV1,
660+
ClusterVersionCapabilityCloudCredential,
661+
ClusterVersionCapabilityIngress,
662+
ClusterVersionCapabilityCloudControllerManager,
663+
ClusterVersionCapabilityOptionalMonitoring,
664+
},
603665
ClusterVersionCapabilitySetCurrent: {
604666
ClusterVersionCapabilityBaremetal,
605667
ClusterVersionCapabilityConsole,
@@ -618,6 +680,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
618680
ClusterVersionCapabilityCloudCredential,
619681
ClusterVersionCapabilityIngress,
620682
ClusterVersionCapabilityCloudControllerManager,
683+
ClusterVersionCapabilityOptionalMonitoring,
621684
},
622685
}
623686

0 commit comments

Comments
 (0)