Update Makefile to include commit ids

kubernetes-sigs · Apr 4, 2022 · cf63de8 · cf63de8
1 parent c86301e
commit cf63de8
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/hack/ccm/Makefile b/hack/ccm/Makefile
@@ -1,19 +1,12 @@
+#TODO: Update the registry
 REGISTRY=quay.io/kabhat
 IMG=powervs-cloud-controller-manager
-VPC_CONTROLLER_COMMIT?=""
-POWERVS_CLOUD_CONTROLLER_COMMIT?=""
-TAG?=$(VPC_CONTROLLER_COMMIT)_$(POWERVS_CLOUD_CONTROLLER_COMMIT)
 
-# Make sure VPC_CONTROLLER_COMMIT and POWERVS_CLOUD_CONTROLLER_COMMIT is set
 # VPC_CONTROLLER_COMMIT can be fetched from here https://github.com/openshift/cloud-provider-vpc-controller/commits/master
+VPC_CONTROLLER_COMMIT?=9b99b4e
 # POWERVS_CLOUD_CONTROLLER_COMMIT can be fetched from here https://github.com/openshift/cloud-provider-powervs/commits/main
-ifeq ($(VPC_CONTROLLER_COMMIT),"")
-  $(error VPC_CONTROLLER_COMMIT is not set)
-else ifeq ($(POWERVS_CLOUD_CONTROLLER_COMMIT),"")
-  $(error POWERVS_CLOUD_CONTROLLER_COMMIT is not set)
-else
-  $(info VPC_CONTROLLER_COMMIT is $(VPC_CONTROLLER_COMMIT) POWERVS_CLOUD_CONTROLLER_COMMIT is $(POWERVS_CLOUD_CONTROLLER_COMMIT))
-endif
+POWERVS_CLOUD_CONTROLLER_COMMIT?=a6bfa07
+TAG?=$(VPC_CONTROLLER_COMMIT)_$(POWERVS_CLOUD_CONTROLLER_COMMIT)
 
 build-image-and-push-linux-amd64: init-buildx
 	{                                                                   \
@@ -40,6 +33,7 @@ init-buildx:
 	docker run --rm --privileged multiarch/qemu-user-static --reset --credential yes --persistent yes
 	# Required for "docker buildx build --push".
 	#TODO: Add respective registry login info
+	docker login quay.io -u kabhat -p Iisc2018@139138
 
 build-and-push-multi-arch: build-image-and-push-linux-amd64 build-image-and-push-linux-ppc64le
 	docker manifest create --amend $(REGISTRY)/$(IMG):$(TAG) $(REGISTRY)/$(IMG):$(TAG)_linux_amd64 $(REGISTRY)/$(IMG):$(TAG)_linux_ppc64le