fixup! MON-3304: Add option to specify resource limits for all components

Author: rexagod

Diff for: pkg/manifests/manifests.go

@@ -47,6 +47,7 @@ import (
 	policyv1 "k8s.io/api/policy/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
@@ -751,7 +752,10 @@ func (f *Factory) KubeStateMetricsDeployment() (*appsv1.Deployment, error) {
 		case "kube-state-metrics":
 			d.Spec.Template.Spec.Containers[i].Image = f.config.Images.KubeStateMetrics
 			if f.config.ClusterMonitoringConfiguration.KubeStateMetricsConfig.Resources != nil {
-				d.Spec.Template.Spec.Containers[i].Resources = *f.config.ClusterMonitoringConfiguration.KubeStateMetricsConfig.Resources
+				err := mergePatchResources(&d.Spec.Template.Spec.Containers[i].Resources, f.config.ClusterMonitoringConfiguration.KubeStateMetricsConfig.Resources)
+				if err != nil {
+					return nil, err
+				}
 			}
 		}
 	}
@@ -3729,3 +3733,22 @@ func containerNameEquals(name string) func(corev1.Container) bool {
 		return c.Name == name
 	}
 }
+
+func mergePatchResources(base, patch *v1.ResourceRequirements) error {
+	baseBytes, err := json.Marshal(base)
+	if err != nil {
+		return err
+	}
+	patchBytes, err := json.Marshal(patch)
+	if err != nil {
+		return err
+	}
+	mergedBytes, err := strategicpatch.StrategicMergePatch(baseBytes, patchBytes, v1.ResourceRequirements{})
+	if err != nil {
+		return err
+	}
+	if err := json.Unmarshal(mergedBytes, base); err != nil {
+		return err
+	}
+	return nil
+}

Diff for: pkg/manifests/manifests_test.go

@@ -27,7 +27,6 @@ import (
 	"time"
 
 	"github.com/openshift/library-go/pkg/crypto"
-
 	monv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 
 	configv1 "github.com/openshift/api/config/v1"
@@ -3365,12 +3364,33 @@ nodeExporter:
 
 }
 
+func compareResources(gotResources, configResources *v1.ResourceRequirements) error {
+	if _, ok := configResources.Limits[v1.ResourceCPU]; ok {
+		if gotResources.Limits[v1.ResourceCPU] != configResources.Limits[v1.ResourceCPU] {
+			return fmt.Errorf("CPU limit incorrectly configured")
+		}
+	}
+	if _, ok := configResources.Limits[v1.ResourceMemory]; ok {
+		if gotResources.Limits[v1.ResourceMemory] != configResources.Limits[v1.ResourceMemory] {
+			return fmt.Errorf("memory limit incorrectly configured")
+		}
+	}
+	if _, ok := configResources.Requests[v1.ResourceCPU]; ok {
+		if gotResources.Requests[v1.ResourceCPU] != configResources.Requests[v1.ResourceCPU] {
+			return fmt.Errorf("CPU request incorrectly configured")
+		}
+	}
+	if _, ok := configResources.Requests[v1.ResourceMemory]; ok {
+		if gotResources.Requests[v1.ResourceMemory] != configResources.Requests[v1.ResourceMemory] {
+			return fmt.Errorf("memory request incorrectly configured")
+		}
+	}
+	return nil
+}
+
 func TestKubeStateMetrics(t *testing.T) {
 	config := `kubeStateMetrics:
   resources:
-    requests:
-      cpu: 100m
-      memory: 100Mi
     limits:
       cpu: 200m
       memory: 200Mi
@@ -3406,8 +3426,11 @@ func TestKubeStateMetrics(t *testing.T) {
 			if container.Image != "docker.io/openshift/origin-kube-state-metrics:latest" {
 				t.Fatal("kube-state-metrics image incorrectly configured")
 			}
-			if !reflect.DeepEqual(container.Resources, *f.config.ClusterMonitoringConfiguration.KubeStateMetricsConfig.Resources) {
-				t.Fatal("kube-state-metrics resources incorrectly configured")
+			gotResources := container.Resources // these resources will be based on the defaults, and overridden by the config
+			configResources := *f.config.ClusterMonitoringConfiguration.KubeStateMetricsConfig.Resources
+			err := compareResources(&gotResources, &configResources)
+			if err != nil {
+				t.Fatalf("kube-state-metrics resources incorrectly configured: %v", err)
 			}
 		case "kube-rbac-proxy-self", "kube-rbac-proxy-main":
 			if container.Image != "docker.io/openshift/origin-kube-rbac-proxy:latest" {