disable OpenShift monitoring for internal Centrals (#1447)

* disable OpenShift monitoring for internal Centrals * use gitops template renderer * set isInternal manually * extract test functions
stackrox · Nov 9, 2023 · cf41d96 · cf41d96
1 parent e7f40a1
commit cf41d96
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/fleetshard/pkg/central/reconciler/reconciler_test.go b/fleetshard/pkg/central/reconciler/reconciler_test.go
@@ -2011,7 +2011,6 @@ func Test_getCentralConfig_telemetry(t *testing.T) {
 }
 
 func TestReconciler_applyRoutes(t *testing.T) {
-
 	type args struct {
 		useRoutes bool
 	}

diff --git a/internal/dinosaur/pkg/gitops/default_central.yaml b/internal/dinosaur/pkg/gitops/default_central.yaml
@@ -55,3 +55,6 @@ spec:
           memory: 2Gi
     monitoring:
       exposeEndpoint: Enabled
+  monitoring:
+    openshift:
+      enabled:  {{ not .IsInternal }}
diff --git a/internal/dinosaur/pkg/gitops/default_central_test.go b/internal/dinosaur/pkg/gitops/default_central_test.go
@@ -12,16 +12,12 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-func TestDefaultCentral(t *testing.T) {
-	p := getDummyCentralParams()
-	central, err := renderDefaultCentral(p)
-	assert.NoError(t, err)
-
+func wantCentralForDummyParams(p *CentralParams) *v1alpha1.Central {
 	exposeEndpointEnabled := v1alpha1.ExposeEndpointEnabled
 	autoScalingEnabled := v1alpha1.ScannerAutoScalingEnabled
 	scannerComponentEnabled := v1alpha1.ScannerComponentEnabled
 
-	wantCentral := v1alpha1.Central{
+	return &v1alpha1.Central{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      p.Name,
 			Namespace: p.Namespace,
@@ -102,16 +98,46 @@ func TestDefaultCentral(t *testing.T) {
 					ExposeEndpoint: &exposeEndpointEnabled,
 				},
 			},
-			Monitoring: nil,
+			Monitoring: &v1alpha1.GlobalMonitoring{
+				OpenShiftMonitoring: &v1alpha1.OpenShiftMonitoring{
+					Enabled: true,
+				},
+			},
 		},
 	}
+}
+
+func assertCentralEquality(t *testing.T, wantCentral *v1alpha1.Central, gotCentral *v1alpha1.Central) {
+	assert.Equal(t, wantCentral, gotCentral)
 
 	// compare yaml
 	wantBytes, err := yaml.Marshal(wantCentral)
 	assert.NoError(t, err)
 
-	gotBytes, err := yaml.Marshal(central)
+	gotBytes, err := yaml.Marshal(gotCentral)
 	assert.NoError(t, err)
 
 	assert.YAMLEq(t, string(wantBytes), string(gotBytes))
 }
+
+func TestDefaultCentral(t *testing.T) {
+	p := getDummyCentralParams()
+	gotCentral, err := renderDefaultCentral(p)
+	assert.NoError(t, err)
+
+	wantCentral := wantCentralForDummyParams(&p)
+
+	assertCentralEquality(t, wantCentral, &gotCentral)
+}
+
+func TestInternalCentral(t *testing.T) {
+	p := getDummyCentralParams()
+	p.IsInternal = true
+	gotCentral, err := renderDefaultCentral(p)
+	assert.NoError(t, err)
+
+	wantCentral := wantCentralForDummyParams(&p)
+	wantCentral.Spec.Monitoring.OpenShiftMonitoring.Enabled = false
+
+	assertCentralEquality(t, wantCentral, &gotCentral)
+}