Fix test

Signed-off-by: Saswata Mukherjee <[email protected]>
stolostron · Dec 12, 2023 · dfaf9a1 · dfaf9a1
1 parent 84e0dd8
commit dfaf9a1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/operators/multiclusterobservability/controllers/multiclusterobservability/observatorium.go b/operators/multiclusterobservability/controllers/multiclusterobservability/observatorium.go
@@ -575,6 +575,9 @@ func newRuleSpec(mco *mcov1beta2.MultiClusterObservability, scSelected string) o
 	ruleSpec.ServiceMonitor = true
 	if !mcoconfig.WithoutResourcesRequests(mco.GetAnnotations()) {
 		ruleSpec.Resources = mcoconfig.GetResources(mcoconfig.ThanosRule, mcoconfig.TShirtSize(mco.Spec.ReadTShirtSize), mco.Spec.AdvancedConfig)
+		if mco.Spec.ReadTShirtSize == "" {
+			mco.Spec.ReadTShirtSize = "small"
+		}
 		ruleSpec.ReloaderResources = v1.ResourceRequirements{
 			Requests: v1.ResourceList{
 				v1.ResourceName(v1.ResourceCPU):    resource.MustParse(mcoconfig.ThanosRuleReloaderCPURequest[mcoconfig.TShirtSize(mco.Spec.ReadTShirtSize)]),
@@ -779,6 +782,9 @@ func newReceiverControllerSpec(mco *mcov1beta2.MultiClusterObservability) obsv1a
 	receiveControllerSpec.ServiceMonitor = true
 	receiveControllerSpec.Version = mcoconfig.ThanosReceiveControllerImgTag
 	if !mcoconfig.WithoutResourcesRequests(mco.GetAnnotations()) {
+		if mco.Spec.WriteTShirtSize == "" {
+			mco.Spec.WriteTShirtSize = "small"
+		}
 		receiveControllerSpec.Resources = v1.ResourceRequirements{
 			Requests: v1.ResourceList{
 				v1.ResourceName(v1.ResourceCPU): resource.MustParse(

diff --git a/operators/multiclusterobservability/pkg/config/resources.go b/operators/multiclusterobservability/pkg/config/resources.go
@@ -226,6 +226,10 @@ func getAdvancedConfigResourceOverride(component string, tshirtSize TShirtSize,
 // GetResources returns the pre-set resource requirements for a particular o11y workload.
 // Always default unless configured via advancedConfig, in which case it is overridden.
 func GetResources(component string, tshirtSize TShirtSize, advanced *observabilityv1beta2.AdvancedConfig) corev1.ResourceRequirements {
+	if tshirtSize == "" {
+		tshirtSize = Small
+	}
+
 	resourceReq := getDefaultResourceRequirements(component, tshirtSize)
 	if advanced != nil {
 		resourceReq = getAdvancedConfigResourceOverride(component, tshirtSize, advanced)
@@ -236,6 +240,10 @@ func GetResources(component string, tshirtSize TShirtSize, advanced *observabili
 
 // GetOBAResources returns the pre-set resource requirements for metrics collector.
 func GetOBAResources(oba *mcoshared.ObservabilityAddonSpec, tshirtSize TShirtSize) *corev1.ResourceRequirements {
+	if tshirtSize == "" {
+		tshirtSize = Small
+	}
+
 	cpuRequests := MetricsCollectorCPURequest[tshirtSize]
 	cpuLimits := MetricsCollectorCPULimits
 	memoryRequests := MetricsCollectorMemoryRequest[tshirtSize]
@@ -283,6 +291,10 @@ func GetOBAResources(oba *mcoshared.ObservabilityAddonSpec, tshirtSize TShirtSiz
 
 // GetReplicas returns the default replicas for a particular o11y workload.
 func GetReplicas(component string, tshirtSize TShirtSize, advanced *observabilityv1beta2.AdvancedConfig) *int32 {
+	if tshirtSize == "" {
+		tshirtSize = Small
+	}
+
 	if advanced == nil {
 		return Replicas[component][tshirtSize]
 	}