OCPCLOUD-3322: Update to new manifests-gen

openshift/Dockerfile.openshift

@@ -12,7 +12,7 @@ FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
 LABEL description="Cluster API Provider IBM Cloud Controller Manager"
 
 COPY --from=builder /build/manager /manager
-COPY --from=builder /build/openshift/manifests /manifests
+COPY openshift/capi-operator-manifests /capi-operator-manifests
 
 ENTRYPOINT [ "/manager" ]
 

openshift/Makefile

@@ -8,22 +8,27 @@ $(RELEASE_DIR):
 
 MANIFESTS_GEN := go run ./vendor/github.com/openshift/cluster-capi-operator/manifests-gen/
 
-$(KUSTOMIZE):
-	./tools/ensure-kustomize.sh
-
 .PHONY: verify
 verify: verify-ocp-manifests
 
 .PHONY: verify-%
-verify-%: ## Ensure no diff after running some other target
+verify-%:
 	$(MAKE) $*
 	./verify-diff.sh
 
 .PHONY: update-manifests-gen
 update-manifests-gen:
-	cd tools && go get github.com/openshift/cluster-capi-operator/manifests-gen && go mod tidy && go mod vendor
+	cd tools && go get github.com/openshift/cluster-capi-operator/manifests-gen@main github.com/openshift/cluster-capi-operator@main && go mod tidy && go mod vendor
 
 .PHONY: ocp-manifests
-ocp-manifests: $(RELEASE_DIR) ## Builds openshift specific manifests
-	# Generate provider manifests.
-	cd tools && $(MANIFESTS_GEN) --provider-name "powervs" --provider-type "InfrastructureProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../../" --manifests-path "../manifests"
+ocp-manifests: ## Builds openshift specific manifests
+	cd tools && $(MANIFESTS_GEN) \
+		--manifests-path "../capi-operator-manifests" \
+		--kustomize-dir "../../openshift" \
+		--name cluster-api-provider-ibmcloud \
+		--install-order 20 \
+		--attribute type=infrastructure \
+		--attribute version="${PROVIDER_VERSION}" \
+		--self-image-ref registry.ci.openshift.org/openshift:ibmcloud-cluster-api-controllers \
+		--platform PowerVS \
+		--protect-cluster-resource ibmpowervscluster

openshift/capi-operator-manifests/default/metadata.yaml

@@ -0,0 +1,7 @@
+attributes:
+  type: infrastructure
+  version: v0.12.0
+installOrder: 20
+name: cluster-api-provider-ibmcloud
+ocpPlatform: PowerVS
+selfImageRef: registry.ci.openshift.org/openshift:ibmcloud-cluster-api-controllers

openshift/kustomization.yaml

@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+components:
+- tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen
+
+resources:
+- ../config/default
+
+images:
+- name: gcr.io/k8s-staging-capi-ibmcloud/cluster-api-ibmcloud-controller
+  newName: registry.ci.openshift.org/openshift
+  newTag: ibmcloud-cluster-api-controllers