Skip to content

pkg/asset/machines/baremetal: Drop unused networkInterfaceAddress from provider() #2598

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-robot merged 1 commit into from
Oct 31, 2019
Merged

pkg/asset/machines/baremetal: Drop unused networkInterfaceAddress from provider() #2598

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
4 changes: 2 additions & 2 deletions pkg/asset/machines/baremetal/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
if pool.Replicas != nil {
total = *pool.Replicas
}
provider := provider(clustername, config.Networking.MachineCIDR.String(), platform, osImage, userDataSecret)
provider := provider(clustername, platform, osImage, userDataSecret)
var machines []machineapi.Machine
for idx := int64(0); idx < total; idx++ {
machine := machineapi.Machine{
Expand Down Expand Up @@ -62,7 +62,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
return machines, nil
}

func provider(clusterName string, networkInterfaceAddress string, platform *baremetal.Platform, osImage string, userDataSecret string) *baremetalprovider.BareMetalMachineProviderSpec {
func provider(clusterName string, platform *baremetal.Platform, osImage string, userDataSecret string) *baremetalprovider.BareMetalMachineProviderSpec {
// The rhcos-downloader container launched by the baremetal-operator downloads the image,
// compresses it to speed up deployments and makes it available on platform.ClusterProvisioningIP, via http
// osImage looks like:
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/machines/baremetal/machinesets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
total = *pool.Replicas
}

provider := provider(clustername, config.Networking.MachineCIDR.String(), platform, osImage, userDataSecret)
provider := provider(clustername, platform, osImage, userDataSecret)
name := fmt.Sprintf("%s-%s-%d", clustername, pool.Name, 0)
mset := &machineapi.MachineSet{
TypeMeta: metav1.TypeMeta{
Expand Down