Skip to content

OCPBUGS-881: fail to create install-config.yaml as apiVIP and ingress VIP are not in machine networks #6469

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 2 commits into from
Jan 12, 2023
Merged

OCPBUGS-881: fail to create install-config.yaml as apiVIP and ingress VIP are not in machine networks #6469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e883e0c
OCPBUGS-881: fail to create install-config.yaml as apiVIP and ingress…
rvanderp3 Oct 6, 2022
532bd4c
addressing linting issues
rvanderp3 Jan 10, 2023
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: 21 additions & 2 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,8 +14,11 @@ 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 @@ -266,6 +269,14 @@ 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 @@ -274,7 +285,11 @@ func getVIPs() (string, string, error) {
Help: "The VIP to be used for the OpenShift API.",
},
Validate: survey.ComposeValidators(survey.Required, func(ans interface{}) error {
return validate.IP((ans).(string))
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
}),
},
}, &apiVIP); err != nil {
Expand All @@ -291,7 +306,11 @@ 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))
}
return validate.IP((ans).(string))
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
}),
},
}, &ingressVIP); err != nil {
Expand Down
32 changes: 30 additions & 2 deletions pkg/asset/installconfig/ovirt/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ import (
ovirtsdk4 "github.com/ovirt/go-ovirt"
"github.com/pkg/errors"

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

func askNetwork(c *ovirtsdk4.Connection, p *ovirt.Platform) error {
Expand Down Expand Up @@ -107,14 +111,29 @@ func askVNICProfileID(c *ovirtsdk4.Connection, p *ovirt.Platform) error {
func askVIPs(p *ovirt.Platform) error {
//TODO: Add support to specify multiple VIPs (-> dual-stack)
var apiVIP, ingressVIP string

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

err := survey.Ask([]*survey.Question{
{
Prompt: &survey.Input{
Message: "Internal API virtual IP",
Help: "This is the virtual IP address that will be used to address the OpenShift control plane. Make sure the IP address is not in use.",
Default: "",
},
Validate: survey.ComposeValidators(survey.Required),
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)
}),
},
}, &apiVIP)
if err != nil {
Expand All @@ -129,7 +148,16 @@ func askVIPs(p *ovirt.Platform) error {
Help: "This is the virtual IP address that will be used to address the OpenShift ingress routers. Make sure the IP address is not in use.",
Default: "",
},
Validate: survey.ComposeValidators(survey.Required),
Validate: survey.ComposeValidators(survey.Required, func(ans interface{}) 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)
}),
},
}, &ingressVIP)
if err != nil {
Expand Down
23 changes: 21 additions & 2 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,6 +15,9 @@ 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 @@ -347,14 +350,26 @@ 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 {
return validate.IP((ans).(string))
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
}),
},
}, &apiVIP); err != nil {
Expand All @@ -371,7 +386,11 @@ 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))
}
return validate.IP((ans).(string))
err := validate.IP((ans).(string))
if err != nil {
return err
}
return validation.ValidateIPinMachineCIDR((ans).(string), defaultMachineNetwork)
}),
},
}, &ingressVIP); err != nil {
Expand Down
5 changes: 3 additions & 2 deletions pkg/types/defaults/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import (
)

var (
defaultMachineCIDR = ipnet.MustParseCIDR("10.0.0.0/16")
// DefaultMachineCIDR default machine CIDR applied to MachineNetwork.
DefaultMachineCIDR = ipnet.MustParseCIDR("10.0.0.0/16")
defaultServiceNetwork = ipnet.MustParseCIDR("172.30.0.0/16")
defaultClusterNetwork = ipnet.MustParseCIDR("10.128.0.0/14")
defaultHostPrefix = 23
Expand All @@ -34,7 +35,7 @@ func SetInstallConfigDefaults(c *types.InstallConfig) {
}
if len(c.Networking.MachineNetwork) == 0 {
c.Networking.MachineNetwork = []types.MachineNetworkEntry{
{CIDR: *defaultMachineCIDR},
{CIDR: *DefaultMachineCIDR},
}
if c.Platform.Libvirt != nil {
c.Networking.MachineNetwork = []types.MachineNetworkEntry{
Expand Down
2 changes: 1 addition & 1 deletion pkg/types/defaults/installconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func defaultInstallConfig() *types.InstallConfig {
AdditionalTrustBundlePolicy: defaultAdditionalTrustBundlePolicy(),
Networking: &types.Networking{
MachineNetwork: []types.MachineNetworkEntry{
{CIDR: *defaultMachineCIDR},
{CIDR: *DefaultMachineCIDR},
},
NetworkType: defaultNetworkType,
ServiceNetwork: []ipnet.IPNet{*defaultServiceNetwork},
Expand Down
7 changes: 4 additions & 3 deletions pkg/types/validation/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ func validateAPIAndIngressVIPs(vips vips, fieldNames vipFields, vipIsRequired bo
}
}

if err := validateIPinMachineCIDR(vip, n); err != nil {
if err := ValidateIPinMachineCIDR(vip, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.APIVIPs), vip, err.Error()))
}

Expand Down Expand Up @@ -621,7 +621,7 @@ func validateAPIAndIngressVIPs(vips vips, fieldNames vipFields, vipIsRequired bo
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.IngressVIPs), vip, err.Error()))
}

if err := validateIPinMachineCIDR(vip, n); err != nil {
if err := ValidateIPinMachineCIDR(vip, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.IngressVIPs), vip, err.Error()))
}

Expand Down Expand Up @@ -657,7 +657,8 @@ func validateAPIAndIngressVIPs(vips vips, fieldNames vipFields, vipIsRequired bo
return allErrs
}

func validateIPinMachineCIDR(vip string, n *types.Networking) error {
// ValidateIPinMachineCIDR confirms if the specified VIP is in the machine CIDR.
func ValidateIPinMachineCIDR(vip string, n *types.Networking) error {
var networks []string

for _, network := range n.MachineNetwork {
Expand Down