Skip to content

OCPCLOUD-3319: Create installer controller #494

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

Merged
openshift-merge-bot merged 9 commits into from
Mar 27, 2026
+38,757 −7,067
Merged

OCPCLOUD-3319: Create installer controller #494

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2be5e22
Export CAPIOperatorIdentifierDomain
mdbooth Mar 22, 2026
297d065
Add WithObjectCollectors
mdbooth Mar 23, 2026
42ae185
Add a fixture for namespace cleanup in envtest
mdbooth Mar 20, 2026
b48c777
Add ClusterAPI singleton to CVO manifests
mdbooth Mar 20, 2026
5042cab
Better BeK8SNotFound matcher
mdbooth Mar 26, 2026
2d2e222
Add installer controller
mdbooth Mar 25, 2026
6648813
make vendor
mdbooth Mar 25, 2026
bf3d73c
Add the installer controller to capi-operator
mdbooth Mar 23, 2026
a404b74
Remove legacy WithRelatedObjects
mdbooth Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 42 additions & 33 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,18 @@ require (
github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6
github.com/pkg/errors v0.9.1
github.com/spf13/pflag v1.0.10
golang.org/x/sync v0.19.0
golang.org/x/sync v0.20.0
golang.org/x/tools v0.42.0
k8s.io/api v0.35.1
k8s.io/apiextensions-apiserver v0.35.1
k8s.io/apimachinery v0.35.1
k8s.io/apiserver v0.35.1
k8s.io/client-go v0.35.1
k8s.io/component-base v0.35.1
k8s.io/klog/v2 v2.130.1
k8s.io/api v0.35.2
k8s.io/apiextensions-apiserver v0.35.2
k8s.io/apimachinery v0.35.2
k8s.io/apiserver v0.35.2
k8s.io/client-go v0.35.2
k8s.io/component-base v0.35.2
k8s.io/klog/v2 v2.140.0
k8s.io/kubernetes v1.35.1
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
k8s.io/utils v0.0.0-20260108192941-914a6e750570
pkg.package-operator.run/boxcutter v0.12.0
sigs.k8s.io/cluster-api v1.12.3
sigs.k8s.io/cluster-api-provider-aws/v2 v2.10.2
sigs.k8s.io/cluster-api-provider-azure v1.22.1
Expand Down Expand Up @@ -194,10 +195,21 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/errors v0.22.4 // indirect
github.com/go-openapi/jsonpointer v0.21.2 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/jsonpointer v0.22.5 // indirect
github.com/go-openapi/jsonreference v0.21.5 // indirect
github.com/go-openapi/strfmt v0.25.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-openapi/swag v0.25.5 // indirect
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
github.com/go-openapi/swag/conv v0.25.5 // indirect
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
github.com/go-openapi/swag/loading v0.25.5 // indirect
github.com/go-openapi/swag/mangling v0.25.5 // indirect
github.com/go-openapi/swag/netutils v0.25.5 // indirect
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.28.0 // indirect
Expand Down Expand Up @@ -230,8 +242,8 @@ require (
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.26.1 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/cel-go v0.27.0 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1 // indirect
github.com/gordonklaus/ineffassign v0.2.0 // indirect
Expand All @@ -252,7 +264,6 @@ require (
github.com/jgautheron/goconst v1.8.2 // indirect
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
github.com/jjti/go-spancheck v0.6.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/julz/importas v0.2.0 // indirect
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
Expand All @@ -272,7 +283,6 @@ require (
github.com/leonklingele/grouper v1.1.2 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/macabu/inamedparam v0.2.0 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
github.com/manuelarte/funcorder v0.5.0 // indirect
github.com/maratori/testableexamples v1.0.1 // indirect
Expand Down Expand Up @@ -300,8 +310,8 @@ require (
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.67.4 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
github.com/quasilyte/gogrep v0.5.0 // indirect
Expand Down Expand Up @@ -331,8 +341,7 @@ require (
github.com/spf13/viper v1.21.0 // indirect
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
github.com/stoewer/go-strcase v1.3.1 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/objx v0.5.3 // indirect
github.com/stretchr/testify v1.11.1 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tetafro/godot v1.5.4 // indirect
Expand Down Expand Up @@ -363,28 +372,28 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.opentelemetry.io/otel v1.41.0 // indirect
go.opentelemetry.io/otel v1.42.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.41.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.41.0 // indirect
go.opentelemetry.io/otel/metric v1.41.0 // indirect
go.opentelemetry.io/otel/metric v1.42.0 // indirect
go.opentelemetry.io/otel/sdk v1.41.0 // indirect
go.opentelemetry.io/otel/trace v1.41.0 // indirect
go.opentelemetry.io/otel/trace v1.42.0 // indirect
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
go.uber.org/mock v0.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/oauth2 v0.35.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/term v0.41.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/time v0.15.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
Expand All @@ -399,7 +408,7 @@ require (
k8s.io/component-helpers v0.35.1 // indirect
k8s.io/controller-manager v0.35.1 // indirect
k8s.io/kube-aggregator v0.35.1 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
k8s.io/kubelet v0.35.1 // indirect
mvdan.cc/gofumpt v0.9.2 // indirect
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
Expand Down
11 changes: 11 additions & 0 deletions manifests/0000_30_cluster-api-installer_06_clusterapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: operator.openshift.io/v1alpha1
kind: ClusterAPI
metadata:
name: cluster
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-gate: "ClusterAPIMachineManagement"
release.openshift.io/create-only: "true"
spec: {}
116 changes: 116 additions & 0 deletions pkg/controllers/installer/boxcutter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/*
Copyright 2026 Red Hat, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package installer

import (
"pkg.package-operator.run/boxcutter"
"pkg.package-operator.run/boxcutter/probing"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/openshift/cluster-capi-operator/pkg/revisiongenerator"
"github.com/openshift/cluster-capi-operator/pkg/util"
)

func toBoxcutterRevision(installerRevision revisiongenerator.InstallerRevision) boxcutter.Revision {
return boxcutterRevision{
revision: installerRevision,
}
}

// boxcutterRevision wraps an InstallerRevision and provides a boxcutter.Revision implementation.
type boxcutterRevision struct {
revision revisiongenerator.InstallerRevision
}

var _ boxcutter.Revision = boxcutterRevision{}

// GetName returns the name of the revision.
func (r boxcutterRevision) GetName() string {
return string(r.revision.RevisionName())
}

// GetRevisionNumber returns the revision number of the revision.
func (r boxcutterRevision) GetRevisionNumber() int64 {
return r.revision.RevisionIndex()
}

// GetPhases returns the phases of the revision.
func (r boxcutterRevision) GetPhases() []boxcutter.Phase {
probeOpts := util.SliceMap(allProbes(), func(p *probing.GroupKindSelector) boxcutter.PhaseReconcileOption {
return boxcutter.WithProbe(boxcutter.ProgressProbeType, p)
})

var phases []boxcutter.Phase

for _, component := range r.revision.Components() {
if crds := component.CRDs(); len(crds) > 0 {
phases = append(phases, boxcutterPhase{
name: component.Name() + "-crds",
objects: crds,
reconcileOptions: probeOpts,
})
}

if objects := component.Objects(); len(objects) > 0 {
phases = append(phases, boxcutterPhase{
name: component.Name(),
objects: objects,
reconcileOptions: probeOpts,
})
}
}

return phases
}

// GetReconcileOptions returns the reconcile options of the revision.
func (r boxcutterRevision) GetReconcileOptions() []boxcutter.RevisionReconcileOption {
return nil
}

// GetTeardownOptions returns the teardown options of the revision.
func (r boxcutterRevision) GetTeardownOptions() []boxcutter.RevisionTeardownOption {
return nil
}

type boxcutterPhase struct {
name string
objects []client.Object
reconcileOptions []boxcutter.PhaseReconcileOption
}

var _ boxcutter.Phase = boxcutterPhase{}

// GetName returns the name of the phase.
func (p boxcutterPhase) GetName() string {
return p.name
}

// GetObjects returns the objects of the phase.
func (p boxcutterPhase) GetObjects() []client.Object {
return p.objects
}

// GetReconcileOptions returns the reconcile options of the phase.
func (p boxcutterPhase) GetReconcileOptions() []boxcutter.PhaseReconcileOption {
return p.reconcileOptions
}

// GetTeardownOptions returns the teardown options of the phase.
func (p boxcutterPhase) GetTeardownOptions() []boxcutter.PhaseTeardownOption {
return nil
}
Loading