Merge pull request #308 from rancher/push-image-to-staging-scc

[main] More CI fixes to enable pushing to Prime registry

Author: jbiers

.github/workflows/publish.yaml

@@ -121,6 +121,10 @@ jobs:
     steps:
       - name : Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - name: Prepare helm charts (needed for build)
+        run: |
+          GIT_TAG=${{ github.ref_name }} BUILD_TARGET=prometheus-federator make package-helm && echo "pf: release chart prepared"
+          BUILD_TARGET=prometheus-federator make build-chart && echo "pf: embedded project-monitoring chart prepared"
       - name: "Read Secrets"
         if: github.repository == 'rancher/prometheus-federator'
         uses: rancher-eio/read-vault-secrets@main

Makefile

@@ -1,8 +1,5 @@
 TARGETS := $(shell ls scripts|grep -ve "^util-\|entry\|^pull-scripts")
 
-# Define target platforms, image builder and the fully qualified image name.
-TARGET_PLATFORMS ?= linux/amd64,linux/arm64
-
 # Default behavior for targets without dapper
 $(TARGETS):
 	./scripts/$@
@@ -28,10 +25,3 @@ list-make:
 	@LC_ALL=C $(MAKE) -pRrq -f $(firstword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/(^|\n)# Files(\n|$$)/,/(^|\n)# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'
 # IMPORTANT: The line above must be indented by (at least one)
 #            *actual TAB character* - *spaces* do *not* work.
-
-push-image: validate version ## build the container image targeting all platforms defined by TARGET_PLATFORMS and push to a registry.
-	docker buildx build -f package/Dockerfile-prometheus-federator \
-		--build-arg RANCHER_PROJECT_MONITORING=$RANCHER_PROJECT_MONITORING \
-		--platform=$(TARGET_PLATFORMS) \
-		-t "$(IMAGE)" --push .
-	@echo "Pushed $(IMAGE)"

scripts/push-image

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+source $(dirname $0)/version
+
+cd $(dirname $0)/..
+
+docker buildx build -f package/Dockerfile-prometheus-federator \
+	--build-arg RANCHER_PROJECT_MONITORING=${RANCHER_PROJECT_MONITORING} ${IID_FILE_FLAG} \
+	--platform="linux/amd64,linux/arm64" \
+	-t ${IMAGE} --push .