diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml index 47ef050285a..6a4f8467e52 100644 --- a/data/data/install.openshift.io_installconfigs.yaml +++ b/data/data/install.openshift.io_installconfigs.yaml @@ -1078,8 +1078,8 @@ spec: type: object type: array machineCIDR: - description: Deprecated name for MachineCIDRs. If set, MachineCIDRs - must be empty or the first index must match. + description: Deprecated way to configure an IP address pool for machines. + Replaced by MachineNetwork which allows for multiple pools. type: Any machineNetwork: description: MachineNetwork is the list of IP address pools for machines. @@ -1105,7 +1105,8 @@ spec: is OpenShiftSDN type: string serviceCIDR: - description: Deprecated name for ServiceNetwork + description: Deprecated way to configure an IP address pool for services. + Replaced by ServiceNetwork which allows for multiple pools. type: Any serviceNetwork: description: 'ServiceNetwork is the list of IP address pools for services. diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go index 960b6eda268..a3ee2651029 100644 --- a/pkg/types/installconfig.go +++ b/pkg/types/installconfig.go @@ -281,8 +281,8 @@ type Networking struct { // Deprecated types, scheduled to be removed - // Deprecated name for MachineCIDRs. If set, MachineCIDRs must - // be empty or the first index must match. + // Deprecated way to configure an IP address pool for machines. + // Replaced by MachineNetwork which allows for multiple pools. // +optional DeprecatedMachineCIDR *ipnet.IPNet `json:"machineCIDR,omitempty"` @@ -290,7 +290,8 @@ type Networking struct { // +optional DeprecatedType string `json:"type,omitempty"` - // Deprecated name for ServiceNetwork + // Deprecated way to configure an IP address pool for services. + // Replaced by ServiceNetwork which allows for multiple pools. // +optional DeprecatedServiceCIDR *ipnet.IPNet `json:"serviceCIDR,omitempty"`