Skip to content

OCPCLOUD-3320: Use new manifests-gen #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mdbooth wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

OCPCLOUD-3320: Use new manifests-gen #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55ef4cb
UPSTREAM: <carry>: Bump manifests-gen
mdbooth Jan 5, 2026
747faa8
UPSTREAM: <carry>: Update to new manifests-gen
mdbooth Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ 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/**


# ignores changes to test-only code to avoid extra rebuilds
test/e2e/**
Expand Down
3 changes: 2 additions & 1 deletion openshift/Dockerfile.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
LABEL description="Cluster API Controller Manager"

COPY --from=builder /build/manager /manager
COPY --from=builder /build/openshift/manifests /manifests
COPY openshift/manifests /manifests
COPY openshift/capi-operator-manifests /capi-operator-manifests
Comment on lines +15 to +16
Copy link

@JoelSpeed JoelSpeed Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why were we previously copying from the builder?

Copy link
Author

@mdbooth mdbooth Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea. It was unnecessary, though.


ENTRYPOINT [ "/manager" ]

Expand Down
9 changes: 7 additions & 2 deletions openshift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,10 @@ ipam-manifests: $(KUSTOMIZE)
.PHONY: ocp-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) -manifests-path "./capi-operator-manifests" -kustomize-dir="../openshift" \
-name "cluster-api" \
-attribute type="core" \
-install-order=10 \
-attribute version="${PROVIDER_VERSION}" \
-self-image-ref registry.ci.openshift.org/openshift:cluster-capi-controllers \
-protect-cluster-resource cluster
Copy link

@JoelSpeed JoelSpeed Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would this flag accept for other types, e.g. AWSCluster? I'm surprised this is just cluster and not a fully qualified name?

Copy link
Author

@mdbooth mdbooth Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an override for the heuristic which was there before, but which seemed to be tripped up by most providers due to having more than one infracluster type.

We could make this fully qualified. Is it worth respinning for it? It would be annoying to change later, so maybe.

24,559 changes: 24,559 additions & 0 deletions openshift/capi-operator-manifests/default/manifests.yaml
View file
Open in desktop
Copy link

@JoelSpeed JoelSpeed Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have we considered writing multiple files rather than one enormous, unreviewable file?

Copy link
Author

@mdbooth mdbooth Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is not primarily for review. It's for consumption by the installer, and one big file is easier to manage. Also, as the output of kustomize is a single KRM-formatted dooberry, we'd have to invent a scheme to split it on. We'd be adding complexity in the producer in order to create complexity for the consumer.

In terms of reviewability, it's no more or less reviewable than the installer_components.yaml we had for review, but no longer need because this file is now always available. What makes you say it's unreviewable? The vendor directory regularly breaks GH, but that's a separate issue.

Copy link

@JoelSpeed JoelSpeed Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a 25k line file?

I would imagine that when we are regenerating files, it would be easier to review if you could see it touched a particular configmap vs some random lines in the midst of 25k

I didn't like that the previous iteration was unreviewable either FWIW

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions openshift/capi-operator-manifests/default/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
attributes:
type: core
version: v1.11.3
installOrder: 10
name: cluster-api
selfImageRef: registry.ci.openshift.org/openshift:cluster-capi-controllers
24,746 changes: 0 additions & 24,746 deletions openshift/infrastructure-components-openshift.yaml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions openshift/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
62 changes: 0 additions & 62 deletions openshift/manifests/0000_30_cluster-api_04_cm.core-cluster-api.yaml
View file
Open in desktop

This file was deleted.

59 changes: 20 additions & 39 deletions openshift/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0+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-20260105114749-aae5635a71a7 // 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
Expand All @@ -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
Expand All @@ -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-20260203192520-8f1aad32df53
github.com/openshift/cluster-capi-operator/manifests-gen => github.com/openshift-cloud-team/cluster-capi-operator/manifests-gen v0.0.0-20260203192520-8f1aad32df53
)
Loading