Skip to content

pkg/types: Correct docs for deprecated options #5444

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
Dec 8, 2021
Merged

pkg/types: Correct docs for deprecated options #5444

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
7 changes: 4 additions & 3 deletions data/data/install.openshift.io_installconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
7 changes: 4 additions & 3 deletions pkg/types/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,16 +281,17 @@ 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"`

// Deprecated name for NetworkType
// +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"`

Expand Down