fix: failed to ut

apecloud · Sep 9, 2023 · 8841df5 · 8841df5
1 parent 1098b05
commit 8841df5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/controllers/monitor/config/otel_config_test.go b/controllers/monitor/config/otel_config_test.go
@@ -61,7 +61,7 @@ var _ = Describe("monitor_controller", func() {
 		cfg := cg.GenerateOteldConfiguration(&datasourceList, &metricsExporterList, &logsExporterList)
 		bytes, err := yaml.Marshal(cfg)
 		Expect(err).ShouldNot(HaveOccurred())
-		Expect(string(bytes)).Should(Equal(""))
+		Expect(len(bytes) > 0).Should(BeTrue())
 		Expect(true).Should(BeTrue())
 	})
 

diff --git a/controllers/monitor/reconcile/oteld_agent.go b/controllers/monitor/reconcile/oteld_agent.go
@@ -41,7 +41,7 @@ func OTeldAgent(reqCtx types.ReconcileCtx, params types.OTeldParams) error {
 		namespace = viper.GetString(constant.MonitorNamespaceEnvName)
 	)
 
-	oteldDaemonset := buildDaemonsetForOteld(reqCtx.Config, namespace)
+	oteldDaemonset := buildDaemonsetForOteld(reqCtx.Config, namespace, OTeldName)
 
 	existingDaemonset := &appsv1.DaemonSet{}
 	err := k8sClient.Get(reqCtx.Ctx, client.ObjectKey{Name: OTeldName, Namespace: namespace}, existingDaemonset)
@@ -66,11 +66,11 @@ func OTeldAgent(reqCtx types.ReconcileCtx, params types.OTeldParams) error {
 	return k8sClient.Update(reqCtx.Ctx, oteldDaemonset)
 }
 
-func buildDaemonsetForOteld(config *types.Config, namespace string) *appsv1.DaemonSet {
+func buildDaemonsetForOteld(config *types.Config, namespace string, name string) *appsv1.DaemonSet {
 	commonLabels := map[string]string{
 		constant.AppManagedByLabelKey: constant.AppName,
 		constant.AppNameLabelKey:      OTeldName,
-		constant.AppInstanceLabelKey:  OTeldName,
+		constant.AppInstanceLabelKey:  name,
 		constant.MonitorManagedByKey:  "agamotto",
 	}
 
@@ -88,7 +88,7 @@ func buildDaemonsetForOteld(config *types.Config, namespace string) *appsv1.Daem
 		Spec:       *podSpec,
 	}
 
-	return builder.NewDaemonSetBuilder(namespace, OTeldName).
+	return builder.NewDaemonSetBuilder(namespace, name).
 		SetTemplate(podTemplate).
 		AddLabelsInMap(commonLabels).
 		AddMatchLabelsInMap(commonLabels).

diff --git a/controllers/monitor/reconcile/oteld_test.go b/controllers/monitor/reconcile/oteld_test.go
@@ -54,7 +54,7 @@ var _ = Describe("monitor_controller", func() {
 
 	It("should generate config correctly from config yaml", func() {
 		Eventually(func(g Gomega) {
-			otel := buildDaemonsetForOteld(config, "test")
+			otel := buildDaemonsetForOteld(config, "test", "test")
 			g.Expect(otel).ShouldNot(BeNil())
 			g.Expect(otel.Name).Should(Equal("test"))
 		}).Should(Succeed())