Skip to content

Bug 1756132: Remove incorrect optional tag from new ingress field #446

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
Sep 27, 2019
Merged

Bug 1756132: Remove incorrect optional tag from new ingress field #446

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
13 changes: 7 additions & 6 deletions operator/v1/types_ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ type IngressControllerSpec struct {
// If unset, the default is based on
// infrastructure.config.openshift.io/cluster .status.platform:
//
// AWS: LoadBalancerService
// Azure: LoadBalancerService
// GCP: LoadBalancerService
// AWS: LoadBalancerService (with External scope)
// Azure: LoadBalancerService (with External scope)
// GCP: LoadBalancerService (with External scope)
// Libvirt: HostNetwork
//
// Any other platform types (including None) default to HostNetwork.
Expand Down Expand Up @@ -186,9 +186,10 @@ var (
// LoadBalancerStrategy holds parameters for a load balancer.
type LoadBalancerStrategy struct {
// scope indicates the scope at which the load balancer is exposed.
// Possible values are "External" and "Internal". The default is
// "External".
// +optional
Copy link
Contributor

@Miciah Miciah Sep 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me, but we need clarification from @deads2k regarding https://github.com/openshift/api/pull/312/files#r294390499.

Copy link
Contributor Author

@ironcladlou ironcladlou Sep 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the package default is Optional, does this need to be explicitly required?

Copy link
Contributor Author

@ironcladlou ironcladlou Sep 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I marked this explicitly required and moved the defaulting docs up to the actual point of defaulting (the optional loadBalancer field).

// Possible values are "External" and "Internal".
//
// +kubebuilder:validation:Required
// +required
Scope LoadBalancerScope `json:"scope"`
}

Expand Down
4 changes: 2 additions & 2 deletions operator/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.