refactor: drop MetricsConfig from ToolchainStatus type

config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml

@@ -95,15 +95,6 @@ spec:
                     description: Environment specifies the host-operator environment
                       such as prod, stage, unit-tests, e2e-tests, dev, etc
                     type: string
-                  metrics:
-                    description: Keeps parameters concerned with metrics
-                    properties:
-                      forceSynchronization:
-                        description: |-
-                          ForceSynchronization is a flag used to trigger synchronization of the metrics
-                          based on the resources rather than on the content of `ToolchainStatus.status.metrics`
-                        type: boolean
-                    type: object
                   notifications:
                     description: Keeps parameters concerned with notifications
                     properties:

config/crd/bases/toolchain.dev.openshift.com_toolchainstatuses.yaml

@@ -15,9 +15,6 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.hostOperator.masterUserRecordCount
-      name: MURs
-      type: integer
     - jsonPath: .status.conditions[?(@.type=="Ready")].status
       name: Ready
       type: string
@@ -542,9 +539,6 @@ spec:
                               type: string
                           type: object
                       type: object
-                    spaceCount:
-                      description: Number of Spaces created within the member cluster
-                      type: integer
                   required:
                   - clusterName
                   - memberStatus
@@ -553,15 +547,6 @@ spec:
                 x-kubernetes-list-map-keys:
                 - clusterName
                 x-kubernetes-list-type: map
-              metrics:
-                additionalProperties:
-                  additionalProperties:
-                    type: integer
-                  type: object
-                description: Metrics is a map that stores metrics to be exposed on
-                  Prometheus.
-                type: object
-                x-kubernetes-map-type: atomic
               registrationService:
                 description: RegistrationService is the status of the registration
                   service

controllers/masteruserrecord/masteruserrecord_controller_test.go

@@ -72,10 +72,10 @@ func TestAddFinalizer(t *testing.T) {
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordProvisioningReason, "")).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -99,10 +99,10 @@ func TestAddFinalizer(t *testing.T) {
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordProvisioningReason, "")).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -128,10 +128,10 @@ func TestAddFinalizer(t *testing.T) {
 			HasConditions(toBeProvisioned(), toBeProvisionedNotificationCreated()).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -159,10 +159,10 @@ func TestAddFinalizer(t *testing.T) {
 		murtest.AssertThatMasterUserRecord(t, "john", hostClient).
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordUnableToAddFinalizerReason, "unable to add finalizer to MUR john"))
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -203,10 +203,10 @@ func TestCreateUserAccountSuccessful(t *testing.T) {
 		HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordProvisioningReason, "")).
 		HasFinalizer()
 	metricstest.AssertThatCountersAndMetrics(t).
-		HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+		HaveUsersPerActivationsAndDomain(map[string]int{
 			"1,internal": 1, // unchanged
 		}).
-		HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+		HaveMasterUserRecordsPerDomain(map[string]int{
 			string(metrics.Internal): 1, // unchanged
 		})
 }
@@ -252,10 +252,10 @@ func TestUserAccountSynchronizeSuccessfulWhenPropagatedClaimsModified(t *testing
 		HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordProvisioningReason, "")).
 		HasFinalizer()
 	metricstest.AssertThatCountersAndMetrics(t).
-		HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+		HaveUsersPerActivationsAndDomain(map[string]int{
 			"1,internal": 1, // unchanged
 		}).
-		HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+		HaveMasterUserRecordsPerDomain(map[string]int{
 			string(metrics.Internal): 1, // unchanged
 		})
 
@@ -311,10 +311,10 @@ func TestCreateUserAccountWhenItWasPreviouslyDeleted(t *testing.T) {
 		HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordProvisioningReason, "")).
 		HasFinalizer()
 	metricstest.AssertThatCountersAndMetrics(t).
-		HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+		HaveUsersPerActivationsAndDomain(map[string]int{
 			"1,internal": 1, // unchanged
 		}).
-		HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+		HaveMasterUserRecordsPerDomain(map[string]int{
 			string(metrics.Internal): 1, // unchanged
 		})
 
@@ -367,10 +367,10 @@ func TestWithMultipleMembersAndSpaces(t *testing.T) {
 			HasStatusUserAccounts(commontest.MemberClusterName).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -409,10 +409,10 @@ func TestWithMultipleMembersAndSpaces(t *testing.T) {
 			HasStatusUserAccounts(commontest.MemberClusterName).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 
@@ -479,10 +479,10 @@ func TestWithMultipleMembersAndSpaces(t *testing.T) {
 			HasStatusUserAccounts().
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -513,10 +513,10 @@ func TestWithMultipleMembersAndSpaces(t *testing.T) {
 			HasStatusUserAccounts().
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -545,10 +545,10 @@ func TestWithMultipleMembersAndSpaces(t *testing.T) {
 			HasStatusUserAccounts().
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -588,10 +588,10 @@ func TestRequeueWhenUserAccountDeleted(t *testing.T) {
 		// then
 		require.NoError(t, err)
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -630,10 +630,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordTargetClusterNotReadyReason, msg)).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -657,10 +657,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordTargetClusterNotReadyReason, msg)).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -685,10 +685,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 		require.Error(t, err)
 		assert.Equal(t, "failed to create user bob: oopsy woopsy", err.Error())
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -716,10 +716,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 		murtest.AssertThatMasterUserRecord(t, "john", hostClient).
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordUnableToCreateUserAccountReason, "unable to create user account john"))
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -759,10 +759,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 		murtest.AssertThatMasterUserRecord(t, "john", hostClient).
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordUnableToSynchronizeUserAccountSpecReason, "unable to update user account john"))
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -801,10 +801,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 			HasConditions(updatingCond).
 			HasStatusUserAccounts()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -837,10 +837,10 @@ func TestCreateSynchronizeOrDeleteUserAccountFailed(t *testing.T) {
 			HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordUnableToDeleteUserAccountsReason, "unable to delete user account john")).
 			HasFinalizer()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -891,10 +891,10 @@ func TestModifyUserAccount(t *testing.T) {
 	murtest.AssertThatMasterUserRecord(t, "john", hostClient).
 		HasConditions(toBeNotReady(toolchainv1alpha1.MasterUserRecordUpdatingReason, ""))
 	metricstest.AssertThatCountersAndMetrics(t).
-		HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+		HaveUsersPerActivationsAndDomain(map[string]int{
 			"1,internal": 1, // unchanged
 		}).
-		HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+		HaveMasterUserRecordsPerDomain(map[string]int{
 			string(metrics.Internal): 1, // unchanged
 		})
 }
@@ -957,10 +957,10 @@ func TestSyncMurStatusWithUserAccountStatuses(t *testing.T) {
 			HasStatusUserAccountsWithCondition(commontest.MemberClusterName, userAccount.Status.Conditions[0]).
 			HasStatusUserAccountsWithCondition(commontest.Member2ClusterName, userAccount2.Status.Conditions[0])
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -1020,10 +1020,10 @@ func TestSyncMurStatusWithUserAccountStatuses(t *testing.T) {
 		assert.Equal(t, "MasterUserRecord", notification.OwnerReferences[0].Kind)
 		assert.Equal(t, mur.Name, notification.OwnerReferences[0].Name)
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 1, // unchanged
 			})
 	})
@@ -1062,11 +1062,11 @@ func TestDeleteUserAccountViaMasterUserRecordBeingDeleted(t *testing.T) {
 		murtest.AssertThatMasterUserRecord(t, "john", hostClient).
 			DoesNotExist()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 				"1,external": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 0, // decremented
 				string(metrics.External): 1, // unchanged
 			})
@@ -1107,11 +1107,11 @@ func TestDeleteUserAccountViaMasterUserRecordBeingDeleted(t *testing.T) {
 		murtest.AssertThatMasterUserRecord(t, "john-wait-for-ua", hostClient).
 			DoesNotExist()
 		metricstest.AssertThatCountersAndMetrics(t).
-			HaveUsersPerActivationsAndDomain(toolchainv1alpha1.Metric{
+			HaveUsersPerActivationsAndDomain(map[string]int{
 				"1,internal": 1, // unchanged
 				"1,external": 1, // unchanged
 			}).
-			HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+			HaveMasterUserRecordsPerDomain(map[string]int{
 				string(metrics.Internal): 0, // decremented
 				string(metrics.External): 1, // unchanged
 			})
@@ -1223,7 +1223,7 @@ func TestDeleteMultipleUserAccountsViaMasterUserRecordBeingDeleted(t *testing.T)
 	murtest.AssertThatMasterUserRecord(t, "john", hostClient).
 		DoesNotExist()
 	metricstest.AssertThatCountersAndMetrics(t).
-		HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{
+		HaveMasterUserRecordsPerDomain(map[string]int{
 			string(metrics.Internal): 0, // decremented
 			string(metrics.External): 1, // unchanged
 		})
@@ -1261,7 +1261,7 @@ func TestDisablingMasterUserRecord(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, userAcc.Spec.Disabled)
 	metricstest.AssertThatCountersAndMetrics(t).
-		HaveMasterUserRecordsPerDomain(toolchainv1alpha1.Metric{string(metrics.Internal): 1}) // unchanged
+		HaveMasterUserRecordsPerDomain(map[string]int{string(metrics.Internal): 1}) // unchanged
 }
 
 func newMurRequest(mur *toolchainv1alpha1.MasterUserRecord) reconcile.Request {