Fix use pipeline ID

DataDog · Aug 1, 2024 · afd065c · afd065c
1 parent 1e4056c
commit afd065c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/e2e-tests/otel-collector/helm/otel_collector.go b/e2e-tests/otel-collector/helm/otel_collector.go
@@ -48,7 +48,7 @@ imagePullSecrets:
 
 	return components.NewComponent(e, resourceName, func(comp *otelcomp.OtelCollector) error {
 
-		_, err := helm.NewInstallation(e, helm.InstallArgs{
+		release, err := helm.NewInstallation(e, helm.InstallArgs{
 			RepoURL:     "https://open-telemetry.github.io/opentelemetry-helm-charts",
 			ChartName:   "opentelemetry-collector",
 			Namespace:   "default",
@@ -57,7 +57,7 @@ imagePullSecrets:
 		}, pulumiResourceOpts...)
 
 		comp.LabelSelectors = pulumi.Map{
-			"app.kubernetes.io/name": pulumi.String("otel-collector"),
+			"app.kubernetes.io/name": release.Name,
 		}
 
 		return err

diff --git a/e2e-tests/otel-collector/provisioner.go b/e2e-tests/otel-collector/provisioner.go
@@ -114,7 +114,9 @@ func RunFunc(ctx *pulumi.Context, env *Kubernetes, params *ProvisionerParams) er
 	}
 	fi.Export(ctx, &env.FakeIntake.FakeintakeOutput)
 
-	otelCollector, err := helm.NewOtelCollector(&awsEnv, "otel-collector", otelparams.WithPulumiResourceOptions(pulumi.Provider(kubeProvider)), otelparams.WithFakeintake(fi))
+	otelOptions := []otelparams.Option{otelparams.WithPulumiResourceOptions(pulumi.Provider(kubeProvider)), otelparams.WithFakeintake(fi)}
+	otelOptions = append(otelOptions, params.otelOptions...)
+	otelCollector, err := helm.NewOtelCollector(&awsEnv, "otel-collector", otelOptions...)
 	if err != nil {
 		return err
 	}
@@ -155,7 +157,10 @@ func LocalRunFunc(ctx *pulumi.Context, env *Kubernetes, params *ProvisionerParam
 	}
 	fakeintake.Export(ctx, &env.FakeIntake.FakeintakeOutput)
 
-	otelCollector, err := helm.NewOtelCollector(&localEnv, "otel-collector", otelparams.WithPulumiResourceOptions(pulumi.Provider(kubeProvider)), otelparams.WithFakeintake(fakeintake))
+	otelOptions := []otelparams.Option{otelparams.WithPulumiResourceOptions(pulumi.Provider(kubeProvider)), otelparams.WithFakeintake(fakeintake)}
+	otelOptions = append(otelOptions, params.otelOptions...)
+
+	otelCollector, err := helm.NewOtelCollector(&localEnv, "otel-collector", otelOptions...)
 	if err != nil {
 		return err
 	}