Skip to content

Commit

Permalink
Bug 1867530: mark deprecated parameters as optional
Browse files Browse the repository at this point in the history
  • Loading branch information
Fedosin committed Aug 10, 2020
1 parent 514166e commit b340487
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
3 changes: 0 additions & 3 deletions data/data/install.openshift.io_installconfigs.yaml
Expand Up @@ -1381,9 +1381,6 @@ spec:
required:
- cloud
- computeFlavor
- octaviaSupport
- region
- trunkSupport
type: object
ovirt:
description: Ovirt is the configuration used when installing on oVirt.
Expand Down
9 changes: 6 additions & 3 deletions pkg/types/openstack/platform.go
Expand Up @@ -5,7 +5,8 @@ package openstack
type Platform struct {
// Region specifies the OpenStack region where the cluster will be created.
// Deprecated: this value is not used by the installer.
Region string `json:"region"`
// +optional
DeprecatedRegion string `json:"region"`

// DefaultMachinePlatform is the default configuration used when
// installing on OpenStack for machine pools which do not define their own
Expand Down Expand Up @@ -38,12 +39,14 @@ type Platform struct {
// TrunkSupport holds a `0` or `1` value that indicates whether or not to use trunk ports
// in your OpenShift cluster.
// Deprecated: this value is set by the installer automatically.
TrunkSupport string `json:"trunkSupport"`
// +optional
DeprecatedTrunkSupport string `json:"trunkSupport"`

// OctaviaSupport holds a `0` or `1` value that indicates whether your OpenStack
// cluster supports Octavia Loadbalancing.
// Deprecated: this value is set by the installer automatically.
OctaviaSupport string `json:"octaviaSupport"`
// +optional
DeprecatedOctaviaSupport string `json:"octaviaSupport"`

// ClusterOSImage is either a URL with `http(s)` or `file` scheme to override
// the default OS image for cluster nodes, or an existing Glance image name.
Expand Down

0 comments on commit b340487

Please sign in to comment.