From a1c0d6a8fe7e8f5ef33de8c79ab63d8a9c1dade0 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Mon, 3 Jun 2024 11:04:31 +0300
Subject: [PATCH] fixes for logs service

---
 .github/workflows/docker-build-develop.yaml   |  6 +-
 .github/workflows/docker-build-release.yaml   | 68 +------------------
 ....goreleaser-docker-build-logs-services.yml |  2 +-
 3 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/docker-build-develop.yaml b/.github/workflows/docker-build-develop.yaml
index d1a6eb3c34e..9beaf680af4 100644
--- a/.github/workflows/docker-build-develop.yaml
+++ b/.github/workflows/docker-build-develop.yaml
@@ -738,11 +738,7 @@ jobs:
 
       - name: Push Docker images
         run: |
-          docker push kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-arm64v8
-          docker push kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-amd64
-
-          docker manifest create kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }} --amend kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-arm64v8 --amend kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-amd64
-          docker manifest push -p kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}
+          docker push kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}
 
 
 #  workflow_dispatch:
diff --git a/.github/workflows/docker-build-release.yaml b/.github/workflows/docker-build-release.yaml
index 130afdd7eda..fedadbd7c74 100644
--- a/.github/workflows/docker-build-release.yaml
+++ b/.github/workflows/docker-build-release.yaml
@@ -138,67 +138,6 @@ jobs:
         run: |
           docker push kubeshop/${{ matrix.repository }}:${{ steps.commit.outputs.short }}
 
-  logs_sidecar:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: stable
-
-      - name: Go Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: logs-sidecar-go-${{ hashFiles('**/go.sum') }}
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - id: commit
-        uses: prompt/actions-commit-hash@v3
-
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser-pro
-          version: latest
-          args: release -f ./goreleaser_files/.goreleaser-docker-build-logs-services.yml --snapshot
-        env:
-          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          DOCKER_BUILDX_BUILDER: "${{ steps.buildx.outputs.name }}"
-          DOCKER_BUILDX_CACHE_FROM: "type=gha"
-          DOCKER_BUILDX_CACHE_TO: "type=gha,mode=max"
-          ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
-          BUSYBOX_IMAGE: ${{ env.BUSYBOX_IMAGE }}
-          IMAGE_TAG_SHA: true
-
-      - name: Push Docker images
-        run: |
-          docker push kubeshop/testkube-logs-sidecar:${{ steps.commit.outputs.short }}-arm64v8
-          docker push kubeshop/testkube-logs-sidecar:${{ steps.commit.outputs.short }}-amd64
-
-          docker manifest create kubeshop/testkube-logs-sidecar:${{ steps.commit.outputs.short }} --amend kubeshop/testkube-logs-sidecar:${{ steps.commit.outputs.short }}-arm64v8 --amend kubeshop/testkube-logs-sidecar:${{ steps.commit.outputs.short }}-amd64
-          docker manifest push -p kubeshop/testkube-logs-sidecar:${{ steps.commit.outputs.short }}
-
   log_server_sidecar:
     strategy:
       matrix:
@@ -267,12 +206,7 @@ jobs:
 
       - name: Push Docker images
         run: |
-          docker push kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-arm64v8
-          docker push kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-amd64
-
-          docker manifest create kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }} --amend kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-arm64v8 --amend kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}-amd64
-          docker manifest push -p kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}
-
+          docker push kubeshop/testkube-${{ matrix.service }}:${{ steps.commit.outputs.short }}
 
   single_executor:
     strategy:
diff --git a/goreleaser_files/.goreleaser-docker-build-logs-services.yml b/goreleaser_files/.goreleaser-docker-build-logs-services.yml
index 375bb62b27b..6c6af1168e0 100644
--- a/goreleaser_files/.goreleaser-docker-build-logs-services.yml
+++ b/goreleaser_files/.goreleaser-docker-build-logs-services.yml
@@ -37,7 +37,7 @@ dockers:
     goarch: amd64
     image_templates:
       - "{{ if not .Env.IMAGE_TAG_SHA }}{{ .Env.DOCKER_REPO }}/testkube-{{ .Env.SERVICE }}:{{ .Version }}-amd64{{ end }}"
-      - "{{ if .Env.IMAGE_TAG_SHA }}{{ .Env.DOCKER_REPO }}/testkube-{{ .Env.SERVICE }}:{{ .ShortCommit }}-amd64{{ end }}"
+      - "{{ if .Env.IMAGE_TAG_SHA }}{{ .Env.DOCKER_REPO }}/testkube-{{ .Env.SERVICE }}:{{ .ShortCommit }}{{ end }}"
       - "{{ if .Env.SANDBOX_IMAGE }}{{ .Env.DOCKER_REPO }}/testkube-sandbox:{{ .Env.SERVICE }}-{{ .Env.BRANCH_IDENTIFIER }}-{{ .ShortCommit }}{{ end }}"
     build_flag_templates:
       - "--platform=linux/amd64"