From f5fcaea0849e45a629105d6b0a65d7865e57bdc1 Mon Sep 17 00:00:00 2001 From: "omri.s" Date: Tue, 23 May 2023 19:17:03 +0300 Subject: [PATCH] fixup --- .github/workflows/release-tag.yaml | 4 ++-- src/operator/Makefile | 1 - src/release.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-tag.yaml b/.github/workflows/release-tag.yaml index 00bb900c6..955e67e5e 100644 --- a/.github/workflows/release-tag.yaml +++ b/.github/workflows/release-tag.yaml @@ -26,7 +26,7 @@ jobs: username: _json_key_base64 password: ${{ secrets.B64_GCLOUD_SERVICE_ACCOUNT_JSON}} - - name: Build Operator Release Image with Tag As Version + - name: Build operator release image with tag as version uses: docker/build-push-action@v2 with: context: src/ @@ -49,7 +49,7 @@ jobs: - name: Push to Docker Hub run: |- - docker pull $${{ env.REGISTRY }}/intents-operator:${{ github.ref_name }} + docker pull ${{ env.REGISTRY }}/intents-operator:${{ github.ref_name }} docker pull ${{ env.REGISTRY }}/watcher:${{ github.sha }} docker tag ${{ env.REGISTRY }}/intents-operator:${{ github.ref_name }} otterize/intents-operator:${{ github.ref_name }} docker tag ${{ env.REGISTRY }}/intents-operator:${{ github.ref_name }} otterize/intents-operator:latest diff --git a/src/operator/Makefile b/src/operator/Makefile index 77d216e4b..410972eb6 100644 --- a/src/operator/Makefile +++ b/src/operator/Makefile @@ -78,7 +78,6 @@ vet: ## Run go vet against code. .PHONY: test test: manifests generate fmt vet envtest ## Run tests. - #go test ../exp/... -coverprofile cover.out KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out ##@ Build diff --git a/src/release.Dockerfile b/src/release.Dockerfile index f072e8913..1916eecf4 100644 --- a/src/release.Dockerfile +++ b/src/release.Dockerfile @@ -1,4 +1,4 @@ -# The only purpose this Dockerfile serves is to be able to run buildx to push a the tag to the version file of the image without rebuilding. +# This Dockerfile enables us to push the release-tag into the /version file of the operator, withour rebuilding the SOURCE_IMAGE. ARG SOURCE_IMAGE FROM alpine as releaser