Skip to content

OTA-1211: api/v1beta1/hostedcluster_types: Add spec.updateService #3576

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-bot merged 1 commit into from
Apr 1, 2024
Merged

OTA-1211: api/v1beta1/hostedcluster_types: Add spec.updateService #3576

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
8 changes: 8 additions & 0 deletions api/hypershift/v1alpha1/hosted_controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

configv1 "github.com/openshift/api/config/v1"
)

func init() {
Expand Down Expand Up @@ -38,6 +40,12 @@ type HostedControlPlaneSpec struct {
// If not defined, ReleaseImage is used
ControlPlaneReleaseImage *string `json:"controlPlaneReleaseImage,omitempty"`

// updateService may be used to specify the preferred upstream update service.
// By default it will use the appropriate update service for the cluster and region.
Copy link
Contributor

@sjenning sjenning Apr 1, 2024

Choose a reason for hiding this comment

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

By default, the field is empty. Any defaulting would occur above this API in OCM/ACM/etc. This comment confused me.

Copy link
Contributor

@sjenning sjenning Apr 1, 2024

Choose a reason for hiding this comment

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

Maybe as a follow-on clean up s/By default it/By default, the CVO/g

Copy link
Member Author

@wking wking Apr 1, 2024

Choose a reason for hiding this comment

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

More future alternative wording options:

By default, lower-level components will use the appropriate update service for the cluster and region.

or:

When empty, lower-level components will use the appropriate update service for the cluster and region.

to avoid committing to the CVO as the lower-level actor that is filling in an opinion when HostedControlPlane has an empty-string here.

//
// +optional
UpdateService configv1.URL `json:"updateService,omitempty"`

// channel is an identifier for explicitly requesting that a non-default
// set of updates be applied to this cluster. The default channel will be
// contain stable updates that are appropriate for production clusters.
Expand Down
6 changes: 6 additions & 0 deletions api/hypershift/v1alpha1/hostedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ type HostedClusterSpec struct {
// +optional
ClusterID string `json:"clusterID,omitempty"`

// updateService may be used to specify the preferred upstream update service.
// By default it will use the appropriate update service for the cluster and region.
//
// +optional
UpdateService configv1.URL `json:"updateService,omitempty"`

// channel is an identifier for explicitly requesting that a non-default
// set of updates be applied to this cluster. The default channel will be
// contain stable updates that are appropriate for production clusters.
Expand Down
8 changes: 8 additions & 0 deletions api/hypershift/v1beta1/hosted_controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

configv1 "github.com/openshift/api/config/v1"
)

func init() {
Expand Down Expand Up @@ -41,6 +43,12 @@ type HostedControlPlaneSpec struct {
// If not defined, ReleaseImage is used
ControlPlaneReleaseImage *string `json:"controlPlaneReleaseImage,omitempty"`

// updateService may be used to specify the preferred upstream update service.
// By default it will use the appropriate update service for the cluster and region.
//
// +optional
UpdateService configv1.URL `json:"updateService,omitempty"`

// channel is an identifier for explicitly requesting that a non-default
// set of updates be applied to this cluster. The default channel will be
// contain stable updates that are appropriate for production clusters.
Expand Down
6 changes: 6 additions & 0 deletions api/hypershift/v1beta1/hostedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,12 @@ type HostedClusterSpec struct {
// +optional
ClusterID string `json:"clusterID,omitempty"`

// updateService may be used to specify the preferred upstream update service.
// By default it will use the appropriate update service for the cluster and region.
//
// +optional
UpdateService configv1.URL `json:"updateService,omitempty"`

// channel is an identifier for explicitly requesting that a non-default
// set of updates be applied to this cluster. The default channel will be
// contain stable updates that are appropriate for production clusters.
Expand Down
32 changes: 21 additions & 11 deletions client/applyconfiguration/hypershift/v1alpha1/hostedclusterspec.go
View file
Open in desktop

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

32 changes: 21 additions & 11 deletions client/applyconfiguration/hypershift/v1beta1/hostedclusterspec.go
View file
Open in desktop

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

Loading