update strings in EmitEventGeneric() calls within dynamic_config.go t…

…o use constants, set MinIO version to avoid unexpected breaking upgrades

Makefile

@@ -11,6 +11,9 @@ NAMESPACE_DRUID_OPERATOR ?= "druid-operator-system"
 NAMESPACE_ZK_OPERATOR ?= "zk-operator"
 # NAMESPACE for zk operator e2e
 NAMESPACE_MINIO_OPERATOR ?= "minio-operator"
+# MinIO version to install. Specific version is set to avoid breaking changes
+# using latest version. This version is tested with the operator.
+MINIO_VERSION ?= "6.0.4"
 # NAMESPACE for druid app e2e
 NAMESPACE_DRUID ?= "druid"
 
@@ -116,9 +119,11 @@ helm-minio-install: ## Helm deploy minio operator and minio
 	--namespace ${NAMESPACE_MINIO_OPERATOR} \
 	--create-namespace \
 	 ${NAMESPACE_MINIO_OPERATOR} minio/operator \
+	--version ${MINIO_VERSION} \
 	-f e2e/configs/minio-operator-override.yaml
 	helm upgrade --install \
 	--namespace ${NAMESPACE_DRUID} \
+	--version ${MINIO_VERSION} \
 	--create-namespace \
   	${NAMESPACE_DRUID}-minio minio/tenant \
 	-f e2e/configs/minio-tenant-override.yaml

controllers/druid/dynamic_config.go

@@ -35,7 +35,7 @@ func updateDruidDynamicConfigs(
 		if err != nil {
 			emitEvent.EmitEventGeneric(
 				druid,
-				"GetRouterSvcUrlFailed",
+				string(druidGetRouterSvcUrlFailed),
 				fmt.Sprintf("Failed to get router service URL for %s", nodeType),
 				err,
 			)
@@ -50,7 +50,7 @@ func updateDruidDynamicConfigs(
 		if err != nil {
 			emitEvent.EmitEventGeneric(
 				druid,
-				"GetAuthCredsFailed",
+				string(druidGetAuthCredsFailed),
 				fmt.Sprintf("Failed to get authentication credentials for %s", nodeType),
 				err,
 			)
@@ -83,7 +83,7 @@ func updateDruidDynamicConfigs(
 		if err != nil {
 			emitEvent.EmitEventGeneric(
 				druid,
-				"FetchCurrentConfigsFailed",
+				string(druidFetchCurrentConfigsFailed),
 				fmt.Sprintf("Failed to fetch current %s dynamic configurations", nodeType),
 				err,
 			)
@@ -96,7 +96,7 @@ func updateDruidDynamicConfigs(
 			)
 			emitEvent.EmitEventGeneric(
 				druid,
-				"FetchCurrentConfigsFailed",
+				string(druidFetchCurrentConfigsFailed),
 				fmt.Sprintf("Failed to fetch current %s dynamic configurations", nodeType),
 				err,
 			)
@@ -116,7 +116,7 @@ func updateDruidDynamicConfigs(
 		if err != nil {
 			emitEvent.EmitEventGeneric(
 				druid,
-				"ConfigComparisonFailed",
+				string(druidConfigComparisonFailed),
 				fmt.Sprintf("Failed to compare %s configurations", nodeType),
 				err,
 			)
@@ -136,7 +136,7 @@ func updateDruidDynamicConfigs(
 		if err != nil {
 			emitEvent.EmitEventGeneric(
 				druid,
-				"UpdateConfigsFailed",
+				string(druidUpdateConfigsFailed),
 				fmt.Sprintf("Failed to update %s dynamic configurations", nodeType),
 				err,
 			)
@@ -148,7 +148,7 @@ func updateDruidDynamicConfigs(
 
 		emitEvent.EmitEventGeneric(
 			druid,
-			"ConfigsUpdated",
+			string(druidUpdateConfigsSuccess),
 			fmt.Sprintf("Successfully updated %s dynamic configurations", nodeType),
 			nil,
 		)

controllers/druid/interface.go

@@ -42,6 +42,13 @@ const (
 	druidFinalizerTriggered druidEventReason = "DruidOperatorFinalizerTriggered"
 	druidFinalizerFailed    druidEventReason = "DruidFinalizerFailed"
 	druidFinalizerSuccess   druidEventReason = "DruidFinalizerSuccess"
+
+	druidGetRouterSvcUrlFailed     druidEventReason = "DruidAPIGetRouterSvcUrlFailed"
+	druidGetAuthCredsFailed        druidEventReason = "DruidAPIGetAuthCredsFailed"
+	druidFetchCurrentConfigsFailed druidEventReason = "DruidAPIFetchCurrentConfigsFailed"
+	druidConfigComparisonFailed    druidEventReason = "DruidAPIConfigComparisonFailed"
+	druidUpdateConfigsFailed       druidEventReason = "DruidAPIUpdateConfigsFailed"
+	druidUpdateConfigsSuccess      druidEventReason = "DruidAPIUpdateConfigsSuccess"
 )
 
 // Reader Interface