Skip to content

OCPBUGS-7015: vsphere, nutanix survey: relax vip in machine cidr #6967

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
Mar 22, 2023
Merged

OCPBUGS-7015: vsphere, nutanix survey: relax vip in machine cidr #6967

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
23 changes: 2 additions & 21 deletions pkg/asset/installconfig/nutanix/nutanix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/defaults"
"github.com/openshift/installer/pkg/types/nutanix"
nutanixtypes "github.com/openshift/installer/pkg/types/nutanix"
"github.com/openshift/installer/pkg/types/validation"
"github.com/openshift/installer/pkg/validate"
)

Expand Down Expand Up @@ -269,14 +266,6 @@ func getSubnet(ctx context.Context, client *nutanixclientv3.Client, peUUID strin
func getVIPs() (string, string, error) {
var apiVIP, ingressVIP string

defaultMachineNetwork := &types.Networking{
MachineNetwork: []types.MachineNetworkEntry{
{
CIDR: *defaults.DefaultMachineCIDR,
},
},
}

//TODO: Add support to specify multiple VIPs (-> dual-stack)
if err := survey.Ask([]*survey.Question{
{
Expand All @@ -285,11 +274,7 @@ func getVIPs() (string, string, error) {
Help: "The VIP to be used for the OpenShift API.",
},
Validate: survey.ComposeValidators(survey.Required, func(ans interface{}) error {
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
return validate.IP((ans).(string))
}),
},
}, &apiVIP); err != nil {
Expand All @@ -306,11 +291,7 @@ func getVIPs() (string, string, error) {
if apiVIP == (ans.(string)) {
return fmt.Errorf("%q should not be equal to the Virtual IP address for the API", ans.(string))
}
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
return validate.IP((ans).(string))
}),
},
}, &ingressVIP); err != nil {
Expand Down
23 changes: 2 additions & 21 deletions pkg/asset/installconfig/vsphere/vsphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ import (
"github.com/vmware/govmomi/vim25"
"k8s.io/apimachinery/pkg/util/sets"

"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/defaults"
"github.com/openshift/installer/pkg/types/validation"
"github.com/openshift/installer/pkg/types/vsphere"
"github.com/openshift/installer/pkg/validate"
)
Expand Down Expand Up @@ -365,26 +362,14 @@ func getNetwork(ctx context.Context, datacenter string, cluster string, finder F
func getVIPs() (string, string, error) {
var apiVIP, ingressVIP string

defaultMachineNetwork := &types.Networking{
MachineNetwork: []types.MachineNetworkEntry{
{
CIDR: *defaults.DefaultMachineCIDR,
},
},
}

if err := survey.Ask([]*survey.Question{
{
Prompt: &survey.Input{
Message: "Virtual IP Address for API",
Help: "The VIP to be used for the OpenShift API.",
},
Validate: survey.ComposeValidators(survey.Required, func(ans interface{}) error {
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
return validate.IP((ans).(string))
}),
},
}, &apiVIP); err != nil {
Expand All @@ -401,11 +386,7 @@ func getVIPs() (string, string, error) {
if apiVIP == (ans.(string)) {
return fmt.Errorf("%q should not be equal to the Virtual IP address for the API", ans.(string))
}
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
return validate.IP((ans).(string))
}),
},
}, &ingressVIP); err != nil {
Expand Down