From c8e038f072657f5e39b3b1bc2aa22b43c43033c8 Mon Sep 17 00:00:00 2001
From: Steve Scaffidi <sscaffidi@cloudera.com>
Date: Mon, 28 Oct 2024 21:32:23 -0400
Subject: [PATCH] goreleaser builds still broken, reverting to docker-buildx

---
 .github/workflows/release.yaml | 25 ++++++++++++++-----------
 .goreleaser.yaml               | 10 ----------
 .ko.yaml                       | 20 --------------------
 3 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 .ko.yaml

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ed912a3..1406a4c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -27,19 +27,22 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: stable
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          distribution: goreleaser
-          version: "~> v2"
-          args: release --clean
+      # this takes the same amount of time as using docker-build, but doesn't currently work...
+      # it seems the binary in the docker image isn't being named '/manager'
+      # - name: Run GoReleaser
+      #   uses: goreleaser/goreleaser-action@v6
+      #   with:
+      #     distribution: goreleaser
+      #     version: "~> v2"
+      #     args: release --clean
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     KO_DOCKER_REPO: ghcr.io/${{ github.repository }}
+      # this takes the same amount of time as using goreleaser, but doesn't create release tarballs
+      - name: Build and Push Docker Images
+        run: make docker-buildx GIT_TAG=${{ github.event.release.tag_name }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          KO_DOCKER_REPO: ghcr.io/${{ github.repository }}
-      #- name: Build and Push Docker Images
-      #  run: make docker-buildx GIT_TAG=${{ github.event.release.tag_name }}
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push OLM Bundle Image
         run: make bundle bundle-build bundle-push GIT_TAG=${{ github.event.release.tag_name }}
         env:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index c0c9a9a..4dc35b1 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -62,16 +62,6 @@ kos:
       org.opencontainers.image.url: "{{ .Env.GITHUB_SERVER_URL }}/{{ .Env.GITHUB_REPOSITORY }}"
       org.opencontainers.image.source: "{{ .Env.GITHUB_SERVER_URL }}/{{ .Env.GITHUB_REPOSITORY }}"
 
-
-# release:
-#   skip_upload: true
-#   footer: |
-#     # Container images
-
-#     ```
-#     ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:{{ .Tag }}
-#     ```
-
 changelog:
   sort: asc
   filters:
diff --git a/.ko.yaml b/.ko.yaml
deleted file mode 100644
index 175c5cc..0000000
--- a/.ko.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-defaultBaseImage: gcr.io/distroless/static:nonroot
-
-defaultPlatforms:
-  - linux/amd64
-  - linux/arm64
-
-defaultEnv:
-  - CGO_ENABLED=0
-
-defaultLdflags:
-  - -s
-  - -w
-  - -extldflags "-static"
-  - -X main.Version={{ .Git.Tag }}
-  - -X main.Commit={{ .Git.FullCommit }}
-  - -X main.CommitDate={{ .Git.CommitDate }}
-
-builds:
-  main: ./cmd