OCPCLOUD-3320: Use new manifests-gen

.dockerignore

@@ -23,6 +23,7 @@ Makefile
 !cmd/clusterctl/config/manifest/clusterctl-api.yaml
 !cmd/clusterctl/client/cluster/assets/cert-manager-test-resources.yaml
 !openshift/manifests/*.yaml
+!openshift/capi-operator-manifests/*.yaml
 
 # ignores changes to test-only code to avoid extra rebuilds
 test/e2e/**

openshift/Dockerfile.openshift

@@ -13,6 +13,7 @@ LABEL description="Cluster API Controller Manager"
 
 COPY --from=builder /build/manager /manager
 COPY --from=builder /build/openshift/manifests /manifests
+COPY --from=builder /build/openshift/capi-operator-manifests /capi-operator-manifests
 
 ENTRYPOINT [ "/manager" ]
 

openshift/Makefile

@@ -1,5 +1,7 @@
 TOOLS_DIR := tools
 
+include provider-version.mk
+
 $(RELEASE_DIR):
 	mkdir -p $(RELEASE_DIR)/
 
@@ -9,12 +11,6 @@ KUSTOMIZE := $(TOOLS_DIR)/bin/kustomize
 $(TOOLS_DIR)/bin/%:
 	$(MAKE) -C $(TOOLS_DIR) bin/$*
 
-.PHONY: check-env
-check-env:
-ifndef PROVIDER_VERSION
-	$(error PROVIDER_VERSION is undefined)
-endif
-
 .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
@@ -33,7 +29,11 @@ ipam-manifests: $(KUSTOMIZE)
 
 # Rebasebot runs ocp-manifests, so we make it generate ipam-manifests too
 .PHONY: ocp-manifests
-ocp-manifests: ipam-manifests $(MANIFESTS_GEN) check-env | $(RELEASE_DIR) ## Builds openshift specific manifests
+ocp-manifests: ipam-manifests $(MANIFESTS_GEN) | $(RELEASE_DIR) ## Builds openshift specific manifests
 	# Generate provider manifests.
-	# TODO: load the provider-version dynamically at rebase time when this is invoked by the Rebase Bot during one of its lifecycle hooks.
-	$(MANIFESTS_GEN) --provider-name "cluster-api" --provider-type "CoreProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../" --manifests-path "./manifests" --kustomize-dir="openshift"
+	$(MANIFESTS_GEN) -base-path "../" -manifests-path "./capi-operator-manifests" -kustomize-dir="openshift" \
+		-provider-name "cluster-api" \
+		-provider-type "core" \
+		-provider-version "${PROVIDER_VERSION}" \
+		-provider-image-ref registry.ci.openshift.org/openshift:cluster-capi-controllers \
+		-protect-cluster-resource cluster

openshift/capi-operator-manifests/metadata.yaml

@@ -0,0 +1,4 @@
+providerImageRef: registry.ci.openshift.org/openshift:cluster-capi-controllers
+providerName: cluster-api
+providerType: core
+providerVersion: v1.11.3

openshift/kustomization.yaml

@@ -1,9 +1,17 @@
 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-cluster-api/cluster-api-controller
+  newName: registry.ci.openshift.org/openshift
+  newTag: cluster-capi-controllers
+
 patches:
 - path: ./patches/enable-metadata-syncing.yaml
 - path: ./patches/failure-policy-ignore-ipam-webhooks.yaml

openshift/provider-version.mk

@@ -0,0 +1 @@
+PROVIDER_VERSION ?= v1.11.3

openshift/tools/go.mod

@@ -5,82 +5,61 @@ go 1.24.0
 toolchain go1.24.3
 
 require (
-	github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20251209152545-de2bd18f0a52
+	github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20251217175905-c68e5901d0d2
 	sigs.k8s.io/kustomize/kustomize/v5 v5.8.0
 )
 
 require (
-	github.com/MakeNowJust/heredoc v1.0.0 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
-	github.com/adrg/xdg v0.5.3 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cert-manager/cert-manager v1.18.2 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
+	github.com/docker/cli v29.0.3+incompatible // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.9.3 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/btree v1.1.3 // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/go-github/v53 v53.2.0 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/go-containerregistry v0.20.7 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.18.1 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/gomega v1.38.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/openshift/api v0.0.0-20251214014457-bfa868a22401 // indirect
+	github.com/openshift/cluster-capi-operator v0.0.0-00010101000000-000000000000 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.23.2 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.66.1 // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
-	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.12.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
-	github.com/spf13/cobra v1.9.1 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spf13/cobra v1.10.1 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/spf13/viper v1.20.1 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/vbatts/tar-split v0.12.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
+	golang.org/x/oauth2 v0.33.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/term v0.37.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
@@ -89,12 +68,9 @@ require (
 	k8s.io/apiextensions-apiserver v0.34.1 // indirect
 	k8s.io/apimachinery v0.34.1 // indirect
 	k8s.io/client-go v0.34.1 // indirect
-	k8s.io/cluster-bootstrap v0.33.3 // indirect
-	k8s.io/component-base v0.34.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
 	k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
-	sigs.k8s.io/cluster-api v1.11.3 // indirect
 	sigs.k8s.io/controller-runtime v0.22.4 // indirect
 	sigs.k8s.io/gateway-api v1.1.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
@@ -105,3 +81,8 @@ require (
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
+
+replace (
+	github.com/openshift/cluster-capi-operator => github.com/openshift-cloud-team/cluster-capi-operator v0.0.0-20251219175055-7f9fc54340be
+	github.com/openshift/cluster-capi-operator/manifests-gen => github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20251219175055-7f9fc54340be
+)