Skip to content
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.

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

MGMT-16814: Use all cluster networks to determine IP family for ironic #6048

Merged
merged 1 commit into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ func (r *PreprovisioningImageReconciler) getIPFamilyForInfraEnv(ctx context.Cont
if err != nil {
return false, false, err
}
return network.GetAddressFamilies(cluster.MachineNetworks)
return network.GetConfiguredAddressFamilies(cluster)
}

func (r *PreprovisioningImageReconciler) getIronicServiceURLs(ctx context.Context, infraEnv *common.InfraEnv) (string, string, error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,11 @@ var _ = Describe("PreprovisioningImage reconcile", func() {
Expect(infraEnv.ObjectMeta.Annotations[EnableIronicAgentAnnotation]).To(Equal("true"))
})
It("Adds the ironic IPv6 address to the ignition when the spoke cluster is IPv6 only", func() {
backendCluster.MachineNetworks = []*models.MachineNetwork{
backendCluster.ClusterNetworks = []*models.ClusterNetwork{
{Cidr: "2001:db8::/32"},
}
backendCluster.MachineNetworks = nil
backendCluster.ServiceNetworks = nil
Expect(c.Create(ctx, infraEnv)).To(BeNil())
mockInstallerInternal.EXPECT().GetInfraEnvByKubeKey(gomock.Any()).Return(backendInfraEnv, nil)
mockInstallerInternal.EXPECT().UpdateInfraEnvInternal(gomock.Any(), gomock.Any(), gomock.Any()).
Expand Down