From 5929c824425a2b1ff4aadb99fc0fabfd4cc93016 Mon Sep 17 00:00:00 2001 From: Carlos Roman Date: Fri, 15 Nov 2024 16:59:17 +0000 Subject: [PATCH] Removing JMX boolean which was added and not used --- components/datadog/agent/docker_image.go | 6 +----- components/datadog/agent/ecs.go | 2 +- components/datadog/agent/ecsFargate.go | 4 ++-- components/datadog/agent/kubernetes_helm.go | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/components/datadog/agent/docker_image.go b/components/datadog/agent/docker_image.go index 2377f5aa9..cd9309456 100644 --- a/components/datadog/agent/docker_image.go +++ b/components/datadog/agent/docker_image.go @@ -17,7 +17,7 @@ const ( defaultOTAgentImageTag = "nightly-ot-beta-main" ) -func dockerAgentFullImagePath(e config.Env, repositoryPath, imageTag string, otel, jmx bool) string { +func dockerAgentFullImagePath(e config.Env, repositoryPath, imageTag string, otel bool) string { // return agent image path if defined if e.AgentFullImagePath() != "" { return e.AgentFullImagePath() @@ -53,10 +53,6 @@ func dockerAgentFullImagePath(e config.Env, repositoryPath, imageTag string, ote imageTag = dockerAgentImageTag(e, config.AgentSemverVersion) } - if jmx { - imageTag = fmt.Sprintf("%s-jmx", imageTag) - } - return utils.BuildDockerImagePath(repositoryPath, imageTag) } diff --git a/components/datadog/agent/ecs.go b/components/datadog/agent/ecs.go index 1f8d4d306..4465f13bc 100644 --- a/components/datadog/agent/ecs.go +++ b/components/datadog/agent/ecs.go @@ -78,7 +78,7 @@ func ecsLinuxAgentSingleContainerDefinition(e config.Env, apiKeySSMParamName pul Cpu: pulumi.IntPtr(200), Memory: pulumi.IntPtr(512), Name: pulumi.String("datadog-agent"), - Image: pulumi.String(dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false, false)), + Image: pulumi.String(dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false)), Essential: pulumi.BoolPtr(true), LinuxParameters: ecs.TaskDefinitionLinuxParametersArgs{ Capabilities: ecs.TaskDefinitionKernelCapabilitiesArgs{ diff --git a/components/datadog/agent/ecsFargate.go b/components/datadog/agent/ecsFargate.go index 541120a5b..bbdb7f70e 100644 --- a/components/datadog/agent/ecsFargate.go +++ b/components/datadog/agent/ecsFargate.go @@ -11,7 +11,7 @@ import ( func ECSFargateLinuxContainerDefinition(e config.Env, image string, apiKeySSMParamName pulumi.StringInput, fakeintake *fakeintake.Fakeintake, logConfig ecs.TaskDefinitionLogConfigurationPtrInput) *ecs.TaskDefinitionContainerDefinitionArgs { if image == "" { - image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false, false) + image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false) } return &ecs.TaskDefinitionContainerDefinitionArgs{ Cpu: pulumi.IntPtr(0), @@ -96,7 +96,7 @@ func ECSFargateLinuxContainerDefinition(e config.Env, image string, apiKeySSMPar // https://docs.aws.amazon.com/AmazonECS/latest/developerguide/tutorial-deploy-fluentbit-on-windows.html func ECSFargateWindowsContainerDefinition(e config.Env, image string, apiKeySSMParamName pulumi.StringInput, fakeintake *fakeintake.Fakeintake) *ecs.TaskDefinitionContainerDefinitionArgs { if image == "" { - image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false, false) + image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false) } return &ecs.TaskDefinitionContainerDefinitionArgs{ Cpu: pulumi.IntPtr(0), diff --git a/components/datadog/agent/kubernetes_helm.go b/components/datadog/agent/kubernetes_helm.go index 289305b97..c5e42d32b 100644 --- a/components/datadog/agent/kubernetes_helm.go +++ b/components/datadog/agent/kubernetes_helm.go @@ -123,7 +123,7 @@ func NewHelmInstallation(e config.Env, args HelmInstallationArgs, opts ...pulumi } // Compute some values - agentImagePath := dockerAgentFullImagePath(e, "", "", args.OTelAgent, false) + agentImagePath := dockerAgentFullImagePath(e, "", "", args.OTelAgent) if args.AgentFullImagePath != "" { agentImagePath = args.AgentFullImagePath }