Skip to content

OSASINFRA-3365: clusterapi: Add worker asset to PreProvision #8237

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 1 commit into from
Apr 6, 2024
Merged

OSASINFRA-3365: clusterapi: Add worker asset to PreProvision #8237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions pkg/asset/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func (c *Cluster) Dependencies() []asset.Asset {
&kubeconfig.AdminClient{},
&bootstrap.Bootstrap{},
&machine.Master{},
&machines.Worker{},
&machines.ClusterAPI{},
new(rhcos.Image),
&manifests.Manifests{},
Expand Down
3 changes: 3 additions & 0 deletions pkg/infrastructure/clusterapi/clusterapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func InitializeProvider(platform Provider) infrastructure.Provider {
//nolint:gocyclo
func (i *InfraProvider) Provision(dir string, parents asset.Parents) ([]*asset.File, error) {
manifestsAsset := &manifests.Manifests{}
workersAsset := &machines.Worker{}
capiManifestsAsset := &capimanifests.Cluster{}
capiMachinesAsset := &machines.ClusterAPI{}
clusterKubeconfigAsset := &kubeconfig.AdminClient{}
Expand All @@ -68,6 +69,7 @@ func (i *InfraProvider) Provision(dir string, parents asset.Parents) ([]*asset.F
masterIgnAsset := &machine.Master{}
parents.Get(
manifestsAsset,
workersAsset,
capiManifestsAsset,
clusterKubeconfigAsset,
clusterID,
Expand Down Expand Up @@ -110,6 +112,7 @@ func (i *InfraProvider) Provision(dir string, parents asset.Parents) ([]*asset.F
RhcosImage: rhcosImage,
ManifestsAsset: manifestsAsset,
MachineManifests: machineManifests,
WorkersAsset: workersAsset,
}

if err := p.PreProvision(ctx, preProvisionInput); err != nil {
Expand Down
2 changes: 2 additions & 0 deletions pkg/infrastructure/clusterapi/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/openshift/installer/pkg/asset/installconfig"
"github.com/openshift/installer/pkg/asset/machines"
"github.com/openshift/installer/pkg/asset/manifests"
"github.com/openshift/installer/pkg/asset/rhcos"
)
Expand Down Expand Up @@ -33,6 +34,7 @@ type PreProvisionInput struct {
RhcosImage *rhcos.Image
ManifestsAsset *manifests.Manifests
MachineManifests []client.Object
WorkersAsset *machines.Worker
}

// IgnitionProvider handles preconditions for bootstrap ignition and
Expand Down