chore: remove legacy distro nr-otel-collector

.github/workflows/ci-nightly.yaml

@@ -20,8 +20,8 @@ jobs:
     strategy:
       matrix:
         distribution:
-          - nr-otel-collector
           - nrdot-collector-host
+          - nrdot-collector-k8s
     uses: ./.github/workflows/ci-base.yaml
     with:
       nightly: true
@@ -46,7 +46,6 @@ jobs:
     strategy:
       matrix:
         distribution:
-          - nr-otel-collector
           - nrdot-collector-host
     steps:
       - name: Checkout

.github/workflows/ci.yaml

@@ -16,8 +16,8 @@ jobs:
     strategy:
       matrix:
         distribution:
-          - nr-otel-collector
           - nrdot-collector-host
+          - nrdot-collector-k8s
     uses: ./.github/workflows/ci-base.yaml
     with:
       distribution: ${{ matrix.distribution }}

.github/workflows/security.yaml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       matrix:
         image:
-          - newrelic/nr-otel-collector
-
+          - newrelic/nrdot-collector-host
+          - newrelic/nrdot-collector-k8s
     steps:
       - name: Run Trivy image vulnerability scanner
         uses: aquasecurity/[email protected]

Makefile

@@ -16,7 +16,7 @@ TOOLS_BIN_NAMES := $(addprefix $(TOOLS_BIN_DIR)/, $(notdir $(shell echo $(TOOLS_
 GO_LICENCE_DETECTOR        := $(TOOLS_BIN_DIR)/go-licence-detector
 GO_LICENCE_DETECTOR_CONFIG   := $(SRC_ROOT)/internal/assets/license/rules.json
 
-DISTRIBUTIONS ?= "nr-otel-collector,nrdot-collector-host"
+DISTRIBUTIONS ?= "nrdot-collector-host,nrdot-collector-k8s"
 
 ci: check build licenses-check
 check: ensure-goreleaser-up-to-date

README.md

@@ -8,8 +8,8 @@ Generated assets are available in the corresponding Github release page and as d
 
 Current list of distributions:
 
-- [nr-otel-collector](./distributions/nr-otel-collector/): (Deprecated) legacy general-purpose distribution
 - [nrdot-collector-host](./distributions/nrdot-collector-host/): distribution focused on monitoring host metrics and logs
+- [nrdot-collector-k8s](./distributions/nrdot-collector-k8s/): distribution focused on monitoring a Kubernetes cluster
 
 ## Support
 

cmd/goreleaser/internal/configure.go

@@ -28,9 +28,8 @@ import (
 const (
 	ArmArch = "arm"
 
-	LegacyDistro = "nr-otel-collector"
-	HostDistro   = "nrdot-collector-host"
-	K8sDistro    = "nrdot-collector-k8s"
+	HostDistro = "nrdot-collector-host"
+	K8sDistro  = "nrdot-collector-k8s"
 
 	DockerHub   = "newrelic"
 	EnvRegistry = "{{ .Env.REGISTRY }}"
@@ -44,7 +43,7 @@ var (
 	NightlyImagePrefixes = []string{EnvRegistry}
 
 	Architectures      = []string{"amd64", "arm64"}
-	DefaultConfigDists = map[string]bool{LegacyDistro: true, HostDistro: true}
+	DefaultConfigDists = map[string]bool{HostDistro: true}
 	K8sDockerSkipArchs = map[string]bool{"arm": true, "386": true}
 	K8sGoos            = []string{"linux"}
 	K8sArchs           = []string{"amd64", "arm64"}