Skip to content

Commit 6469f94

Browse files
author
AnnaZivkovic
committed
CORS-2950: Remove openshift-sdn as an install-time option
The openshift-sdn CNI plug-in will no longer be an install-time option for newly installed 4.15+ clusters across installation options. Note that customer clusters currently using openshift-sdn that upgrade to 4.15 or 4.16 with openshift-sdn will remain fully supported.
1 parent 0791abe commit 6469f94

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

pkg/types/validation/installconfig.go

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import (
5353
)
5454

5555
// list of known plugins that require hostPrefix to be set
56-
var pluginsUsingHostPrefix = sets.NewString(string(operv1.NetworkTypeOpenShiftSDN), string(operv1.NetworkTypeOVNKubernetes))
56+
var pluginsUsingHostPrefix = sets.NewString(string(operv1.NetworkTypeOVNKubernetes))
5757

5858
// ValidateInstallConfig checks that the specified install config is valid.
5959
//
@@ -282,10 +282,6 @@ func validateNetworkingIPVersion(n *types.Networking, p *types.Platform) field.E
282282

283283
switch {
284284
case hasIPv4 && hasIPv6:
285-
if n.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
286-
allErrs = append(allErrs, field.Invalid(field.NewPath("networking", "networkType"), n.NetworkType, "dual-stack IPv4/IPv6 is not supported for this networking plugin"))
287-
}
288-
289285
if len(n.ServiceNetwork) != 2 {
290286
allErrs = append(allErrs, field.Invalid(field.NewPath("networking", "serviceNetwork"), strings.Join(ipnetworksToStrings(n.ServiceNetwork), ", "), "when installing dual-stack IPv4/IPv6 you must provide two service networks, one for each IP address type"))
291287
}
@@ -327,10 +323,6 @@ func validateNetworkingIPVersion(n *types.Networking, p *types.Platform) field.E
327323
}
328324

329325
case hasIPv6:
330-
if n.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
331-
allErrs = append(allErrs, field.Invalid(field.NewPath("networking", "networkType"), n.NetworkType, "IPv6 is not supported for this networking plugin"))
332-
}
333-
334326
switch {
335327
case p.BareMetal != nil:
336328
case p.VSphere != nil:
@@ -369,8 +361,8 @@ func validateNetworking(n *types.Networking, singleNodeOpenShift bool, fldPath *
369361
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkType"), n.NetworkType, "networkType Kuryr is not supported on OpenShift later than 4.14"))
370362
}
371363

372-
if singleNodeOpenShift && n.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
373-
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkType"), n.NetworkType, "networkType OpenShiftSDN is currently not supported on Single Node OpenShift"))
364+
if n.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
365+
allErrs = append(allErrs, field.Invalid(fldPath.Child("networkType"), n.NetworkType, "networkType OpenShiftSDN is deprecated, please use OVNKubernetes"))
374366
}
375367

376368
if len(n.MachineNetwork) > 0 {
@@ -772,10 +764,6 @@ func validateAPIAndIngressVIPs(vips vips, fieldNames vipFields, vipIsRequired, r
772764
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.APIVIPs), vip, err.Error()))
773765
}
774766
}
775-
776-
if utilsnet.IsIPv6String(vip) && n.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
777-
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.APIVIPs), vip, "IPv6 is not supported on OpenShiftSDN"))
778-
}
779767
}
780768

781769
if len(vips.Ingress) == 0 {
@@ -819,10 +807,6 @@ func validateAPIAndIngressVIPs(vips vips, fieldNames vipFields, vipIsRequired, r
819807
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.IngressVIPs), vip, err.Error()))
820808
}
821809
}
822-
823-
if utilsnet.IsIPv6String(vip) && n.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
824-
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldNames.IngressVIPs), vip, "IPv6 is not supported on OpenShiftSDN"))
825-
}
826810
}
827811

828812
if len(vips.API) == 0 {

0 commit comments

Comments
 (0)