Skip to content

Bug 1840496: [baremetal] Remove DNS VIP #3304

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
May 27, 2020
Merged

Bug 1840496: [baremetal] Remove DNS VIP #3304

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
5 changes: 0 additions & 5 deletions docs/user/metal/install_ipi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ purposes:
following purposes:
* API - This IP will be used to reach the cluster API.
* Ingress - This IP will be used by cluster ingress traffic
* DNS - This IP will be used internally by the cluster for automating
internal DNS requirements.
* ***External DNS*** - While the cluster automates the internal DNS
requirements, two external DNS records must be created in whatever DNS
Expand Down Expand Up @@ -163,7 +162,6 @@ platform:
baremetal:
apiVIP: 192.168.111.5
ingressVIP: 192.168.111.4
dnsVIP: 192.168.111.3
provisioningNetworkInterface: enp1s0
hosts:
- name: openshift-master-0
Expand Down Expand Up @@ -211,16 +209,13 @@ sshKey: ...
`defaultMachinePlatform` | | The default configuration used for machine pools without a platform configuration. |
`apiVIP` | `api.<clusterdomain>` | The VIP to use for internal API communication. |
`ingressVIP` | `test.apps.<clusterdomain>` | The VIP to use for ingress traffic. |
`dnsVIP` | | The VIP to use for internal DNS communication. |

##### VIP Settings

The `apiVIP` and `ingressVIP` settings must either be provided or
pre-configured in DNS so that the default names resolve correctly (see
the defaults in the table above).

The `dnsVIP` setting has no default and must always be provided.

##### Describing Hosts

The `hosts` parameter is a list of separate bare metal assets that
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
config.Spec.PlatformSpec.Type = configv1.BareMetalPlatformType
config.Status.PlatformStatus.BareMetal = &configv1.BareMetalPlatformStatus{
APIServerInternalIP: installConfig.Config.Platform.BareMetal.APIVIP,
NodeDNSIP: installConfig.Config.Platform.BareMetal.DNSVIP,
IngressIP: installConfig.Config.Platform.BareMetal.IngressVIP,
}
case gcp.Name:
Expand Down
5 changes: 0 additions & 5 deletions pkg/types/baremetal/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ type Platform struct {
// +kubebuilder:validation:Format=ip
IngressVIP string `json:"ingressVIP"`

// DNSVIP is the VIP to use for internal DNS communication
//
// +kubebuilder:validation:Format=ip
DNSVIP string `json:"dnsVIP"`

// BootstrapOSImage is a URL to override the default OS image
// for the bootstrap node. The URL must contain a sha256 hash of the image
// e.g https://mirror.example.com/images/qemu.qcow2.gz?sha256=a07bd...
Expand Down
7 changes: 0 additions & 7 deletions pkg/types/baremetal/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,13 +294,6 @@ func ValidatePlatform(p *baremetal.Platform, n *types.Networking, fldPath *field
allErrs = append(allErrs, field.Invalid(fldPath.Child("ingressVIP"), p.IngressVIP, err.Error()))
}

if err := validate.IP(p.DNSVIP); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("dnsVIP"), p.DNSVIP, err.Error()))
}

if err := validateIPinMachineCIDR(p.DNSVIP, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("dnsVIP"), p.DNSVIP, err.Error()))
}
if err := validateIPNotinMachineCIDR(p.ClusterProvisioningIP, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("provisioningHostIP"), p.ClusterProvisioningIP, err.Error()))
}
Expand Down
12 changes: 0 additions & 12 deletions pkg/types/baremetal/validation/platform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@ func TestValidatePlatform(t *testing.T) {
APIVIP("192.168.222.2").build(),
expected: "Invalid value: \"192.168.222.2\": the virtual IP is expected to be in one of the machine networks",
},
{
name: "invalid_dnsvip",
platform: platform().
DNSVIP("192.168.222.3").build(),
expected: "Invalid value: \"192.168.222.3\": the virtual IP is expected to be in one of the machine networks",
},
{
name: "invalid_ingressvip",
platform: platform().
Expand Down Expand Up @@ -389,7 +383,6 @@ func platform() *platformBuilder {
return &platformBuilder{
baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
Expand Down Expand Up @@ -441,11 +434,6 @@ func (pb *platformBuilder) APIVIP(value string) *platformBuilder {
return pb
}

func (pb *platformBuilder) DNSVIP(value string) *platformBuilder {
pb.Platform.DNSVIP = value
return pb
}

func (pb *platformBuilder) IngressVIP(value string) *platformBuilder {
pb.Platform.IngressVIP = value
return pb
Expand Down
25 changes: 0 additions & 25 deletions pkg/types/validation/installconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ func validBareMetalPlatform() *baremetal.Platform {
DefaultMachinePlatform: &baremetal.MachinePool{},
APIVIP: "10.0.0.5",
IngressVIP: "10.0.0.4",
DNSVIP: "10.0.0.2",
}
}

Expand Down Expand Up @@ -621,30 +620,6 @@ func TestValidateInstallConfig(t *testing.T) {
}(),
expectedError: `^platform\.baremetal\.apiVIP: Invalid value: "10\.1\.0\.5": the virtual IP is expected to be in one of the machine networks$`,
},
{
name: "baremetal DNS VIP not an IP",
installConfig: func() *types.InstallConfig {
c := validInstallConfig()
c.Platform = types.Platform{
BareMetal: validBareMetalPlatform(),
}
c.Platform.BareMetal.DNSVIP = "test"
return c
}(),
expectedError: `^\[platform\.baremetal\.dnsVIP: Invalid value: "test": "test" is not a valid IP, platform\.baremetal\.dnsVIP: Invalid value: "test": the virtual IP is expected to be in one of the machine networks]$`,
},
{
name: "baremetal DNS VIP set to an incorrect value",
installConfig: func() *types.InstallConfig {
c := validInstallConfig()
c.Platform = types.Platform{
BareMetal: validBareMetalPlatform(),
}
c.Platform.BareMetal.DNSVIP = "10.1.0.6"
return c
}(),
expectedError: `^platform\.baremetal\.dnsVIP: Invalid value: "10\.1\.0\.6": the virtual IP is expected to be in one of the machine networks$`,
},
{
name: "baremetal Ingress VIP not an IP",
installConfig: func() *types.InstallConfig {
Expand Down