Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions api/hypershift/v1beta1/hosted_controlplane.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,15 @@ type HostedControlPlaneStatus struct {
// +kubebuilder:validation:MaxLength=255
OAuthCallbackURLTemplate string `json:"oauthCallbackURLTemplate,omitempty"`

// consoleURL is the URL of the OpenShift web console for this hosted cluster.
// This is populated from the console.config.openshift.io/cluster resource
// in the guest cluster once the console operator has reconciled.
// +optional
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=4096
// +kubebuilder:validation:XValidation:rule="isURL(self)",message="consoleURL must be a valid URL"
ConsoleURL string `json:"consoleURL,omitempty"`

// controlPlaneVersion tracks the rollout status of the control plane
// components running on the management cluster, independently from
// the data-plane version reported in the version field.
Expand Down
18 changes: 18 additions & 0 deletions api/hypershift/v1beta1/hostedcluster_conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,22 @@ const (
// A failure here often means a software bug or a non-stable cluster.
ReconciliationSucceeded ConditionType = "ReconciliationSucceeded"

// ConfigOperatorReconciliationSucceeded indicates if the HostedCluster Config
// Operator (HCCO) reconciliation succeeded. The HCCO is responsible for
// reconciling resources inside the hosted cluster (e.g. global configuration,
// CRDs, RBAC, and connectivity checks).
// A failure here often means a software bug, a non-stable cluster, or
// connectivity issues between the control plane and the hosted cluster.
ConfigOperatorReconciliationSucceeded ConditionType = "ConfigOperatorReconciliationSucceeded"

// ValidHostedClusterStatus indicates whether status information propagated
// from the hosted cluster (e.g. ConsoleURL from the console operator) is
// valid and was accepted. A False value means the hosted cluster reported
// data that could not be propagated — for example, a ConsoleURL that
// exceeds the maximum allowed length. This condition is set by HCCO and
// bubbled up to the HostedCluster.
ValidHostedClusterStatus ConditionType = "ValidHostedClusterStatus"

// EtcdRecoveryActive indicates that the Etcd cluster is failing and the
// recovery job was triggered.
EtcdRecoveryActive ConditionType = "EtcdRecoveryActive"
Expand Down Expand Up @@ -324,6 +340,8 @@ const (

ControlPlaneConnectionNoWorkerNodesAvailableReason = "NoWorkerNodesAvailable"

InvalidHostedClusterStatusReason = "InvalidHostedClusterStatus"

ControlPlaneComponentsNotAvailable = "ComponentsNotAvailable"

AutoNodeNotConfiguredReason = "AutoNodeNotConfigured"
Expand Down
9 changes: 9 additions & 0 deletions api/hypershift/v1beta1/hostedcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -2302,6 +2302,15 @@ type HostedClusterStatus struct {
// +kubebuilder:validation:MaxLength=1024
OAuthCallbackURLTemplate string `json:"oauthCallbackURLTemplate,omitempty"`

// consoleURL is the URL of the OpenShift web console for this hosted cluster.
// This is populated from the console.config.openshift.io/cluster resource
// in the guest cluster once the console operator has reconciled.
// +optional
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=4096
// +kubebuilder:validation:XValidation:rule="isURL(self)",message="consoleURL must be a valid URL"
ConsoleURL string `json:"consoleURL,omitempty"`

// payloadArch represents the CPU architecture type of the HostedCluster.Spec.Release.Image. The valid values are:
// Multi, ARM64, AMD64, S390X, or PPC64LE.
// +kubebuilder:validation:Enum=Multi;ARM64;AMD64;PPC64LE;S390X
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6524,6 +6524,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6663,6 +6663,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6507,6 +6507,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6527,6 +6527,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7005,6 +7005,17 @@ spec:
x-kubernetes-list-type: map
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7145,6 +7145,17 @@ spec:
x-kubernetes-list-type: map
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6961,6 +6961,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6927,6 +6927,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6572,6 +6572,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6529,6 +6529,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6525,6 +6525,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6583,6 +6583,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7058,6 +7058,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6326,6 +6326,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6467,6 +6467,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6309,6 +6309,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6329,6 +6329,17 @@ spec:
type: object
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6807,6 +6807,17 @@ spec:
x-kubernetes-list-type: map
type: object
type: object
consoleURL:
description: |-
consoleURL is the URL of the OpenShift web console for this hosted cluster.
This is populated from the console.config.openshift.io/cluster resource
in the guest cluster once the console operator has reconciled.
maxLength: 4096
minLength: 1
type: string
x-kubernetes-validations:
- message: consoleURL must be a valid URL
rule: isURL(self)
controlPlaneEndpoint:
description: |-
controlPlaneEndpoint contains the endpoint information by which
Expand Down
Loading
Loading