From cfedc0bebc5be6e125590961500ab526ab1d174d Mon Sep 17 00:00:00 2001
From: jackgopack4 <john.peterson@datadoghq.com>
Date: Wed, 9 Oct 2024 11:16:47 -0400
Subject: [PATCH] update goreleaser and gh actions to remove
 builder-config.yaml refs

---
 .github/workflows/builder-release.yaml   | 6 ++----
 .github/workflows/builder-testbuild.yaml | 6 ++----
 cmd/builder/.goreleaser.yml              | 6 ------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml
index b5c8a0f5..9d604275 100644
--- a/.github/workflows/builder-release.yaml
+++ b/.github/workflows/builder-release.yaml
@@ -33,10 +33,8 @@ jobs:
           repository: "open-telemetry/opentelemetry-collector"
           ref: ${{ github.ref_name }}
           path: ".core"
-      - name: Copy Dockerfile and builder-config.yaml
-        run:  |
-          cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile
-          cp cmd/builder/builder-config.yaml .core/cmd/builder/builder-config.yaml
+      - name: Copy Dockerfile to Core Repo directory
+        run:  cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile
       - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
       - uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
diff --git a/.github/workflows/builder-testbuild.yaml b/.github/workflows/builder-testbuild.yaml
index a5746f1e..b06eee34 100644
--- a/.github/workflows/builder-testbuild.yaml
+++ b/.github/workflows/builder-testbuild.yaml
@@ -36,10 +36,8 @@ jobs:
           fetch-depth: 0
           repository: "open-telemetry/opentelemetry-collector"
           path: ".core"
-      - name: Copy Dockerfile and builder-config.yaml
-        run:  |
-          cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile
-          cp cmd/builder/builder-config.yaml .core/cmd/builder/builder-config.yaml
+      - name: Copy Dockerfile to Core Repo directory
+        run:  cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile
       - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
       - uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml
index ae04a2ed..8461452a 100644
--- a/cmd/builder/.goreleaser.yml
+++ b/cmd/builder/.goreleaser.yml
@@ -33,8 +33,6 @@ dockers:
       - johnpeterson785/opentelemetry-collector-builder:latest-amd64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
-    extra_files: 
-      - builder-config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/amd64
@@ -52,8 +50,6 @@ dockers:
       - johnpeterson785/opentelemetry-collector-builder:latest-arm64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
-    extra_files: 
-      - builder-config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/arm64
@@ -71,8 +67,6 @@ dockers:
       - johnpeterson785/opentelemetry-collector-builder:latest-ppc64le
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
-    extra_files: 
-      - builder-config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/ppc64le