@@ -61,6 +61,10 @@ TEST_COHERENCE_IMAGE ?= $(COHERENCE_IMAGE)
6161TEST_COHERENCE_VERSION ?= $(COHERENCE_VERSION )
6262TEST_COHERENCE_GID ?= com.oracle.coherence.ce
6363
64+ # The minimum certified OpenShift version the Operator runs on
65+ OPENSHIFT_MIN_VERSION := v4.15
66+ OPENSHIFT_COMPONENT_PID := 67b738ef88736e8a179ac976
67+
6468# The current working directory
6569CURRDIR := $(shell pwd)
6670
@@ -340,13 +344,15 @@ SHELL = /usr/bin/env bash -o pipefail
340344# Capture the Git commit to add to the build information that is then embedded in the Go binary
341345# ----------------------------------------------------------------------------------------------------------------------
342346GITCOMMIT ?= $(shell git rev-list -1 HEAD)
347+ GITBRANCH ?= $(shell git branch --show-current)
343348GITREPO := https://github.com/oracle/coherence-operator.git
344349SOURCE_DATE_EPOCH := $(shell git show -s --format=format:% ct HEAD)
345350DATE_FMT := "%Y-%m-%dT%H:%M:%SZ"
346- BUILD_DATE := $(shell date -u -d "@$SOURCE_DATE_EPOCH" "+${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "+${DATE_FMT}" 2>/dev/null || date -u "+${DATE_FMT}")
351+ # BUILD_DATE := $(shell date -u -d "@$SOURCE_DATE_EPOCH" "+${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "+${DATE_FMT}" 2>/dev/null || date -u "+${DATE_FMT}")
352+ BUILD_DATE := $(shell date -u "+${DATE_FMT}")
347353BUILD_USER := $(shell whoami)
348354
349- LDFLAGS = -X main.Version=$(VERSION ) -X main.Commit=$(GITCOMMIT ) -X main.Date=$(BUILD_DATE ) -X main.Author=$(BUILD_USER )
355+ LDFLAGS = -X main.Version=$(VERSION ) -X main.Commit=$(GITCOMMIT ) -X main.Branch= $( GITBRANCH ) -X main. Date=$(BUILD_DATE ) -X main.Author=$(BUILD_USER )
350356GOS = $(shell find . -type f -name "* .go" ! -name "* _test.go")
351357HELM_FILES = $(shell find helm-charts/coherence-operator -type f)
352358API_GO_FILES = $(shell find . -type f -name "* .go" ! -name "* _test.go" ! -name "zz* .go")
@@ -460,7 +466,9 @@ $(BUILD_PROPS):
460466clean : # # Cleans the build
461467 -rm -rf $(BUILD_OUTPUT ) || true
462468 -rm -rf $(BUILD_BIN ) || true
469+ -rm -rf artifacts || true
463470 -rm -rf bundle || true
471+ -rm bundle.Dockerfile || true
464472 rm config/crd/bases/* .yaml || true
465473 rm -rf config/crd-small || true
466474 rm pkg/data/zz_generated_* .go || true
@@ -895,6 +903,13 @@ bundle: $(BUILD_PROPS) ensure-sdk $(TOOLS_BIN)/kustomize $(BUILD_TARGETS)/manife
895903 $(OPERATOR_SDK ) generate kustomize manifests
896904 cd config/manager && $(KUSTOMIZE ) edit set image controller=$(OPERATOR_IMAGE )
897905 $(KUSTOMIZE ) build config/manifests | $(OPERATOR_SDK ) generate bundle -q --overwrite --version $(VERSION ) $(BUNDLE_METADATA_OPTS )
906+ @echo " " >> ./bundle/metadata/annotations.yaml
907+ @echo " # OpenShift annotations" >> ./bundle/metadata/annotations.yaml
908+ @echo " com.redhat.openshift.versions: $( OPENSHIFT_MIN_VERSION) " >> ./bundle/metadata/annotations.yaml
909+ @echo " " >> bundle.Dockerfile
910+ @echo " # OpenShift labels" >> bundle.Dockerfile
911+ @echo " LABEL com.redhat.openshift.versions=$( OPENSHIFT_MIN_VERSION) " >> bundle.Dockerfile
912+ @echo " cert_project_id: $( OPENSHIFT_COMPONENT_PID) " > bundle/ci.yaml
898913 $(OPERATOR_SDK ) bundle validate ./bundle
899914 $(OPERATOR_SDK ) bundle validate ./bundle --select-optional suite=operatorframework --optional-values=k8s-version=1.26
900915 $(OPERATOR_SDK ) bundle validate ./bundle --select-optional name=operatorhubv2 --optional-values=k8s-version=1.26
@@ -952,7 +967,7 @@ catalog-build: opm ## Build a catalog image.
952967# Push the catalog image.
953968.PHONY : catalog-push
954969catalog-push : # # Push a catalog image.
955- $(DOCKER_CMD ) push $(CATALOG_IMAGE )
970+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( CATALOG_IMAGE )
956971
957972.PHONY : scorecard
958973scorecard : $(BUILD_PROPS ) ensure-sdk bundle # # Run the Operator SDK scorecard tests.
@@ -1037,9 +1052,6 @@ jk: $(BUILD_PREFLIGHT)/preflight.yaml
10371052
10381053# Generate the preflight job yaml
10391054$(BUILD_PREFLIGHT ) /preflight.yaml : hack/preflight.yaml
1040- # ifeq ($(PREFLIGHT_REGISTRY_CRED),)
1041- # $(error $(n)The PREFLIGHT_REGISTRY_CRED variable must be specified to run preflight$(n)Typically using the command$(n)$(n) export PREFLIGHT_REGISTRY_CRED=$$(echo -n bogus:$$(oc whoami -t) | base64)$(n)$(n))
1042- # endif
10431055 cp hack/preflight.yaml $(BUILD_PREFLIGHT ) /preflight.yaml
10441056 $(SED ) -e ' s^image-placeholder^$(OPERATOR_IMAGE)^g' $(BUILD_PREFLIGHT ) /preflight.yaml
10451057 $(SED ) -e ' s/registry-credential-placeholder/$(PREFLIGHT_REGISTRY_CRED)/g' $(BUILD_PREFLIGHT ) /preflight.yaml
@@ -2299,6 +2311,7 @@ PUSH_ARGS ?=
22992311push-operator-image : $(BUILD_TARGETS ) /build-operator
23002312 $(DOCKER_CMD ) push $(PUSH_ARGS ) $(OPERATOR_IMAGE_AMD )
23012313 $(DOCKER_CMD ) push $(PUSH_ARGS ) $(OPERATOR_IMAGE_ARM )
2314+ $(DOCKER_CMD ) rmi $(OPERATOR_IMAGE ) || true
23022315 $(DOCKER_CMD ) manifest create $(PUSH_ARGS ) $(OPERATOR_IMAGE ) \
23032316 --amend $(OPERATOR_IMAGE_AMD ) \
23042317 --amend $(OPERATOR_IMAGE_ARM )
@@ -2326,27 +2339,27 @@ push-test-images:
23262339.PHONY : push-ttl-test-images
23272340push-ttl-test-images :
23282341 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE ) $(TTL_APPLICATION_IMAGE )
2329- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE )
2342+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE )
23302343 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_CLIENT ) $(TTL_APPLICATION_IMAGE_CLIENT )
2331- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_CLIENT )
2344+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_CLIENT )
23322345 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_HELIDON ) $(TTL_APPLICATION_IMAGE_HELIDON )
2333- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_HELIDON )
2346+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_HELIDON )
23342347 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_HELIDON_3 ) $(TTL_APPLICATION_IMAGE_HELIDON_3 )
2335- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_HELIDON_3 )
2348+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_HELIDON_3 )
23362349 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_HELIDON_2 ) $(TTL_APPLICATION_IMAGE_HELIDON_2 )
2337- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_HELIDON_2 )
2350+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_HELIDON_2 )
23382351 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_SPRING ) $(TTL_APPLICATION_IMAGE_SPRING )
2339- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_SPRING )
2352+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_SPRING )
23402353 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_SPRING_FAT ) $(TTL_APPLICATION_IMAGE_SPRING_FAT )
2341- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_SPRING_FAT )
2354+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_SPRING_FAT )
23422355 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_SPRING_CNBP ) $(TTL_APPLICATION_IMAGE_SPRING_CNBP )
2343- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_SPRING_CNBP )
2356+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_SPRING_CNBP )
23442357 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_SPRING_2 ) $(TTL_APPLICATION_IMAGE_SPRING_2 )
2345- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_SPRING_2 )
2358+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_SPRING_2 )
23462359 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_SPRING_FAT_2 ) $(TTL_APPLICATION_IMAGE_SPRING_FAT_2 )
2347- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_SPRING_FAT_2 )
2360+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_SPRING_FAT_2 )
23482361 $(DOCKER_CMD ) tag $(TEST_APPLICATION_IMAGE_SPRING_CNBP_2 ) $(TTL_APPLICATION_IMAGE_SPRING_CNBP_2 )
2349- $(DOCKER_CMD ) push $(TTL_APPLICATION_IMAGE_SPRING_CNBP_2 )
2362+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_APPLICATION_IMAGE_SPRING_CNBP_2 )
23502363
23512364# ----------------------------------------------------------------------------------------------------------------------
23522365# Build the Operator Test images
@@ -2365,15 +2378,15 @@ build-compatibility-image: $(BUILD_TARGETS)/java
23652378# ----------------------------------------------------------------------------------------------------------------------
23662379.PHONY : push-compatibility-image
23672380push-compatibility-image : build-compatibility-image
2368- $(DOCKER_CMD ) push $(TEST_COMPATIBILITY_IMAGE )
2381+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TEST_COMPATIBILITY_IMAGE )
23692382
23702383# ----------------------------------------------------------------------------------------------------------------------
23712384# Push the Operator JIB Test Docker images to ttl.sh
23722385# ----------------------------------------------------------------------------------------------------------------------
23732386.PHONY : push-ttl-compatibility-image
23742387push-ttl-compatibility-image :
23752388 $(DOCKER_CMD ) tag $(TEST_COMPATIBILITY_IMAGE ) $(TTL_COMPATIBILITY_IMAGE )
2376- $(DOCKER_CMD ) push $(TTL_COMPATIBILITY_IMAGE )
2389+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_COMPATIBILITY_IMAGE )
23772390
23782391# ----------------------------------------------------------------------------------------------------------------------
23792392# Push all of the Docker images
@@ -2387,7 +2400,7 @@ push-all-images: push-test-images push-operator-image
23872400.PHONY : push-ttl-operator-images
23882401push-ttl-operator-images :
23892402 $(DOCKER_CMD ) tag $(OPERATOR_IMAGE ) $(TTL_OPERATOR_IMAGE )
2390- $(DOCKER_CMD ) push $(TTL_OPERATOR_IMAGE )
2403+ $(DOCKER_CMD ) push $(PUSH_ARGS ) $( TTL_OPERATOR_IMAGE )
23912404
23922405# ----------------------------------------------------------------------------------------------------------------------
23932406# Push all the images to ttl.sh
0 commit comments