diff --git a/api/v1alpha1/toolchaincluster_types.go b/api/v1alpha1/toolchaincluster_types.go index d695761b..5d9fbf3a 100644 --- a/api/v1alpha1/toolchaincluster_types.go +++ b/api/v1alpha1/toolchaincluster_types.go @@ -3,18 +3,13 @@ package v1alpha1 // Most of the code was copied from the KubeFedCluster CRD of the KubeFed project https://github.com/kubernetes-sigs/kubefed import ( - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -type ToolchainClusterConditionType string - // These are valid conditions of a cluster. const ( - // ToolchainClusterReady means the cluster is ready to accept workloads. - ToolchainClusterReady ToolchainClusterConditionType = "Ready" // ToolchainClusterOffline means the cluster is temporarily down or not reachable - ToolchainClusterOffline ToolchainClusterConditionType = "Offline" + ToolchainClusterOffline ConditionType = "Offline" ToolchainClusterClusterReadyReason = "ClusterReady" ToolchainClusterClusterNotReadyReason = "ClusterNotReady" @@ -73,7 +68,7 @@ type LocalSecretReference struct { type ToolchainClusterStatus struct { // Conditions is an array of current cluster conditions. // +listType=atomic - Conditions []ToolchainClusterCondition `json:"conditions"` + Conditions []Condition `json:"conditions"` } //+kubebuilder:object:root=true @@ -100,30 +95,6 @@ type ToolchainCluster struct { Status ToolchainClusterStatus `json:"status,omitempty"` } -// ToolchainClusterCondition describes current state of a cluster. -// +k8s:openapi-gen=true -type ToolchainClusterCondition struct { - // Type of cluster condition, Ready or Offline. - Type ToolchainClusterConditionType `json:"type"` - // Status of the condition, one of True, False, Unknown. - Status corev1.ConditionStatus `json:"status"` - // Last time the condition was checked. - // +optional - LastProbeTime metav1.Time `json:"lastProbeTime"` - // Last time the condition was updated - // +optional - LastUpdatedTime *metav1.Time `json:"lastUpdatedTime,omitempty"` - // Last time the condition transit from one status to another. - // +optional - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - // (brief) reason for the condition's last transition. - // +optional - Reason string `json:"reason,omitempty"` - // Human readable message indicating details about last transition. - // +optional - Message string `json:"message,omitempty"` -} - //+kubebuilder:object:root=true // ToolchainClusterList contains a list of ToolchainCluster diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index eb30a84f..9122cc80 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -3046,30 +3046,6 @@ func (in *ToolchainCluster) DeepCopyObject() runtime.Object { return nil } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ToolchainClusterCondition) DeepCopyInto(out *ToolchainClusterCondition) { - *out = *in - in.LastProbeTime.DeepCopyInto(&out.LastProbeTime) - if in.LastUpdatedTime != nil { - in, out := &in.LastUpdatedTime, &out.LastUpdatedTime - *out = (*in).DeepCopy() - } - if in.LastTransitionTime != nil { - in, out := &in.LastTransitionTime, &out.LastTransitionTime - *out = (*in).DeepCopy() - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ToolchainClusterCondition. -func (in *ToolchainClusterCondition) DeepCopy() *ToolchainClusterCondition { - if in == nil { - return nil - } - out := new(ToolchainClusterCondition) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ToolchainClusterConfig) DeepCopyInto(out *ToolchainClusterConfig) { *out = *in @@ -3153,7 +3129,7 @@ func (in *ToolchainClusterStatus) DeepCopyInto(out *ToolchainClusterStatus) { *out = *in if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make([]ToolchainClusterCondition, len(*in)) + *out = make([]Condition, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index 0597c18d..56fcfceb 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -118,7 +118,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/codeready-toolchain/api/api/v1alpha1.TierTemplateSpec": schema_codeready_toolchain_api_api_v1alpha1_TierTemplateSpec(ref), "github.com/codeready-toolchain/api/api/v1alpha1.TiersConfig": schema_codeready_toolchain_api_api_v1alpha1_TiersConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainCluster": schema_codeready_toolchain_api_api_v1alpha1_ToolchainCluster(ref), - "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterCondition": schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterCondition(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterConfig": schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterSpec": schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterSpec(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterStatus": schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterStatus(ref), @@ -4303,71 +4302,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_ToolchainCluster(ref common.Ref } } -func schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ToolchainClusterCondition describes current state of a cluster.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "type": { - SchemaProps: spec.SchemaProps{ - Description: "Type of cluster condition, Ready or Offline.", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - "status": { - SchemaProps: spec.SchemaProps{ - Description: "Status of the condition, one of True, False, Unknown.", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - "lastProbeTime": { - SchemaProps: spec.SchemaProps{ - Description: "Last time the condition was checked.", - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), - }, - }, - "lastUpdatedTime": { - SchemaProps: spec.SchemaProps{ - Description: "Last time the condition was updated", - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), - }, - }, - "lastTransitionTime": { - SchemaProps: spec.SchemaProps{ - Description: "Last time the condition transit from one status to another.", - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), - }, - }, - "reason": { - SchemaProps: spec.SchemaProps{ - Description: "(brief) reason for the condition's last transition.", - Type: []string{"string"}, - Format: "", - }, - }, - "message": { - SchemaProps: spec.SchemaProps{ - Description: "Human readable message indicating details about last transition.", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"type", "status"}, - }, - }, - Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, - } -} - func schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -4473,7 +4407,7 @@ func schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterStatus(ref comm Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterCondition"), + Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.Condition"), }, }, }, @@ -4484,7 +4418,7 @@ func schema_codeready_toolchain_api_api_v1alpha1_ToolchainClusterStatus(ref comm }, }, Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterCondition"}, + "github.com/codeready-toolchain/api/api/v1alpha1.Condition"}, } }