Skip to content

WIP: SPLAT-2410: Change annotation from feature-set to feature-gate #83

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

Open
AnnaZivkovic wants to merge 4 commits into
base: master
Choose a base branch
from
Open

WIP: SPLAT-2410: Change annotation from feature-set to feature-gate #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42846e6
UPSTREAM: <carry>: Change annotation from feature-set to feature-gate
AnnaZivkovic Feb 23, 2026
278ea72
UPSTREAM: <carry>: Update cluster-capi-operator/manifests-gen to v0.0…
AnnaZivkovic Feb 23, 2026
ec623db
UPSTREAM: <carry>: Adapt to new manifests-gen CLI and OpenShift registry
AnnaZivkovic Feb 24, 2026
8ad9f46
UPSTREAM: <carry>: test
AnnaZivkovic Feb 24, 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: 1 addition & 1 deletion config/base/manager_image_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller:main
- image: registry.ci.openshift.org/openshift:cluster-api-provider-vsphere
name: manager
2 changes: 1 addition & 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,7 @@ FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
LABEL description="Cluster API Provider vSphere Controller Manager"

COPY --from=builder /build/manager /manager
COPY --from=builder /build/openshift/manifests /manifests
COPY --from=builder /build/openshift/manifests /capi-operator-manifests

ENTRYPOINT [ "/manager" ]

Expand Down
2 changes: 1 addition & 1 deletion openshift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ update-manifests-gen:
.PHONY: ocp-manifests
ocp-manifests: $(RELEASE_DIR) ## Builds openshift specific manifests
# Generate provider manifests.
cd tools && $(MANIFESTS_GEN) --provider-name "vsphere" --provider-type "InfrastructureProvider" --provider-version "${PROVIDER_VERSION}" --base-path "../../" --manifests-path "../manifests"
cd tools && $(MANIFESTS_GEN) --platform "VSphere" --name "vsphere" --kustomize-dir "../../config/default" --manifests-path ".." --profile-name "manifests"
Loading