Update cloud-proivder-powervs commit (#2335)

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

hack/ccm/Makefile

@@ -20,10 +20,10 @@ REGISTRY=gcr.io/k8s-staging-capi-ibmcloud
 IMG=powervs-cloud-controller-manager
 
 # POWERVS_CLOUD_CONTROLLER_COMMIT can be fetched from here https://github.com/openshift/cloud-provider-powervs/commits/main
-POWERVS_CLOUD_CONTROLLER_COMMIT?=7c51cd2
+POWERVS_CLOUD_CONTROLLER_COMMIT?=ef83f3f
 TAG?=$(POWERVS_CLOUD_CONTROLLER_COMMIT)
 
-build-image: init-buildx
+build-image: init-buildx gcloud-auth
 	{ \
 		set -e ; \
 		docker buildx build \
@@ -38,6 +38,18 @@ init-buildx:
 	-docker buildx rm multiarch-multiplatform-builder
 	docker buildx create --use --name=multiarch-multiplatform-builder
 	docker run --rm --privileged multiarch/qemu-user-static --reset --credential yes --persistent yes
+
+gcloud-auth:
 	# Register gcloud as a Docker credential helper.
 	# Required for "docker buildx build --push".
 	gcloud auth configure-docker --quiet
+
+build-local: init-buildx
+	{ \
+		set -e ; \
+		docker buildx build \
+			--platform=linux/$(ARCH) --pull \
+			--build-arg golang_image=$(GO_CONTAINER_IMAGE) \
+			--build-arg POWERVS_CLOUD_CONTROLLER_COMMIT=$(POWERVS_CLOUD_CONTROLLER_COMMIT) \
+			-t $(REGISTRY)/$(IMG)-$(ARCH):$(TAG) . --output=type=docker --target centos-base; \
+    }

hack/verify-container-images.sh

@@ -34,15 +34,18 @@ TRIVY="${REPO_ROOT}/hack/tools/bin/trivy/${VERSION}/trivy"
 make REGISTRY=gcr.io/k8s-staging-capi-ibmcloud PULL_POLICY=IfNotPresent TAG=dev OUTPUT_TYPE=type=docker docker-build
 make clean-release-git
 
+make -C hack/ccm ARCH="${GO_ARCH}" TAG=dev build-local
+
 # Scan the images
 "${TRIVY}" image -q --exit-code 1 --ignore-unfixed --severity MEDIUM,HIGH,CRITICAL gcr.io/k8s-staging-capi-ibmcloud/cluster-api-ibmcloud-controller-"${GO_ARCH}":dev && R1=$? || R1=$?
+"${TRIVY}" image -q --exit-code 1 --ignore-unfixed --severity MEDIUM,HIGH,CRITICAL gcr.io/k8s-staging-capi-ibmcloud/powervs-cloud-controller-manager-"${GO_ARCH}":dev && R2=$? || R2=$?
 
 echo ""
 BRed='\033[1;31m'
 BGreen='\033[1;32m'
 NC='\033[0m' # No
 
-if [ "$R1" -ne "0" ]
+if [ "$R1" -ne "0" ] || [ "$R2"  -ne "0" ]
 then
   echo -e "${BRed}Check container images failed! There are vulnerabilities to be fixed${NC}"
   exit 1