From c3fceab9da6397df347d78821c97e26f43f44351 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Wed, 24 Sep 2025 18:26:41 +0530 Subject: [PATCH 1/3] SANDBOX-1392: Drop dependency on Che instance Signed-off-by: Feny Mehta --- api/v1alpha1/docs/apiref.adoc | 52 ---------- api/v1alpha1/memberoperatorconfig_types.go | 48 --------- api/v1alpha1/memberstatus_types.go | 4 - api/v1alpha1/zz_generated.deepcopy.go | 68 ------------- api/v1alpha1/zz_generated.openapi.go | 109 +-------------------- 5 files changed, 1 insertion(+), 280 deletions(-) diff --git a/api/v1alpha1/docs/apiref.adoc b/api/v1alpha1/docs/apiref.adoc index ffe01899..553b16b8 100644 --- a/api/v1alpha1/docs/apiref.adoc +++ b/api/v1alpha1/docs/apiref.adoc @@ -288,55 +288,6 @@ Users with captcha score lower than the required one can still be approved manua |=== -[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-checonfig"] -==== CheConfig - - - -Defines all parameters concerned with Che - - - -.Appears In: -**** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberoperatorconfigspec[$$MemberOperatorConfigSpec$$] -**** - -[cols="20a,50a,15a,15a", options="header"] -|=== -| Field | Description | Default | Validation -| *`keycloakRouteName`* __string__ | Defines the Che/CRW Keycloak route name + | | -| *`routeName`* __string__ | Defines the Che/CRW route name + | | -| *`namespace`* __string__ | Defines the Che/CRW operator namespace + | | -| *`required`* __boolean__ | Defines a flag that indicates whether the Che/CRW operator is required to be installed on the cluster. May be used in monitoring. + | | -| *`userDeletionEnabled`* __boolean__ | Defines a flag to turn the Che user deletion logic on/off + | | -| *`secret`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chesecret[$$CheSecret$$]__ | Defines all secrets related to Che configuration + | | -|=== - - -[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chesecret"] -==== CheSecret - - - -Defines all secrets related to Che configuration - - - -.Appears In: -**** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-checonfig[$$CheConfig$$] -**** - -[cols="20a,50a,15a,15a", options="header"] -|=== -| Field | Description | Default | Validation -| *`ref`* __string__ | Reference is the name of the secret resource to look up + | | -| *`cheAdminUsernameKey`* __string__ | The key for the Che admin username in the secret values map + | | -| *`cheAdminPasswordKey`* __string__ | The key for the Che admin password in the secret values map + | | -|=== - - [id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus"] ==== CheStatus @@ -1089,7 +1040,6 @@ MemberOperatorConfigSpec contains all configuration parameters of the member ope | Field | Description | Default | Validation | *`auth`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-authconfig[$$AuthConfig$$]__ | Keeps parameters concerned with authentication + | | | *`autoscaler`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-autoscalerconfig[$$AutoscalerConfig$$]__ | Keeps parameters concerned with the autoscaler + | | -| *`che`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-checonfig[$$CheConfig$$]__ | Keeps parameters concerned with Che/CRW + | | | *`console`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-consoleconfig[$$ConsoleConfig$$]__ | Keeps parameters concerned with the console + | | | *`environment`* __string__ | Environment specifies the member-operator environment such as prod, stage, unit-tests, e2e-tests, dev, etc + | | | *`skipUserCreation`* __boolean__ | Defines the flag that determines whether User and Identity resources should be created for a UserAccount + | | @@ -2329,7 +2279,6 @@ Routes contains information about the public routes available to the user in the |=== | Field | Description | Default | Validation | *`consoleURL`* __string__ | ConsoleURL is the web console URL of the cluster + | | -| *`cheDashboardURL`* __string__ | CheDashboardURL is the Che Dashboard URL of the cluster if Che is installed + | | | *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current member operator status conditions + Supported condition types: ConditionReady + | | |=== @@ -3458,7 +3407,6 @@ ToolchainSecret defines a reference to a secret, this type should be included in .Appears In: **** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chesecret[$$CheSecret$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-notificationsecret[$$NotificationSecret$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceverificationsecret[$$RegistrationServiceVerificationSecret$$] diff --git a/api/v1alpha1/memberoperatorconfig_types.go b/api/v1alpha1/memberoperatorconfig_types.go index e59e8c34..5329e772 100644 --- a/api/v1alpha1/memberoperatorconfig_types.go +++ b/api/v1alpha1/memberoperatorconfig_types.go @@ -15,10 +15,6 @@ type MemberOperatorConfigSpec struct { // +optional Autoscaler AutoscalerConfig `json:"autoscaler,omitempty"` - // Keeps parameters concerned with Che/CRW - // +optional - Che CheConfig `json:"che,omitempty"` - // Keeps parameters concerned with the console // +optional Console ConsoleConfig `json:"console,omitempty"` @@ -72,50 +68,6 @@ type AutoscalerConfig struct { BufferReplicas *int `json:"bufferReplicas,omitempty"` } -// Defines all parameters concerned with Che -// +k8s:openapi-gen=true -type CheConfig struct { - // Defines the Che/CRW Keycloak route name - // +optional - KeycloakRouteName *string `json:"keycloakRouteName,omitempty"` - - // Defines the Che/CRW route name - // +optional - RouteName *string `json:"routeName,omitempty"` - - // Defines the Che/CRW operator namespace - // +optional - Namespace *string `json:"namespace,omitempty"` - - // Defines a flag that indicates whether the Che/CRW operator is required to be installed on the cluster. May be used in monitoring. - // +optional - Required *bool `json:"required,omitempty"` - - // Defines a flag to turn the Che user deletion logic on/off - // +optional - UserDeletionEnabled *bool `json:"userDeletionEnabled,omitempty"` - - // Defines all secrets related to Che configuration - // +optional - Secret CheSecret `json:"secret,omitempty"` -} - -// Defines all secrets related to Che configuration -// +k8s:openapi-gen=true -type CheSecret struct { - // The reference to the secret that is expected to contain the keys below - // +optional - ToolchainSecret `json:",inline"` - - // The key for the Che admin username in the secret values map - // +optional - CheAdminUsernameKey *string `json:"cheAdminUsernameKey,omitempty"` - - // The key for the Che admin password in the secret values map - // +optional - CheAdminPasswordKey *string `json:"cheAdminPasswordKey,omitempty"` -} - // Defines all parameters concerned with the console // +k8s:openapi-gen=true type ConsoleConfig struct { diff --git a/api/v1alpha1/memberstatus_types.go b/api/v1alpha1/memberstatus_types.go index 350a026a..15994b6e 100644 --- a/api/v1alpha1/memberstatus_types.go +++ b/api/v1alpha1/memberstatus_types.go @@ -75,10 +75,6 @@ type Routes struct { // +optional ConsoleURL string `json:"consoleURL,omitempty"` - // CheDashboardURL is the Che Dashboard URL of the cluster if Che is installed - // +optional - CheDashboardURL string `json:"cheDashboardURL,omitempty"` - // Conditions is an array of current member operator status conditions // Supported condition types: ConditionReady // +optional diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 7a786203..98217ca6 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -246,73 +246,6 @@ func (in *CaptchaConfig) DeepCopy() *CaptchaConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CheConfig) DeepCopyInto(out *CheConfig) { - *out = *in - if in.KeycloakRouteName != nil { - in, out := &in.KeycloakRouteName, &out.KeycloakRouteName - *out = new(string) - **out = **in - } - if in.RouteName != nil { - in, out := &in.RouteName, &out.RouteName - *out = new(string) - **out = **in - } - if in.Namespace != nil { - in, out := &in.Namespace, &out.Namespace - *out = new(string) - **out = **in - } - if in.Required != nil { - in, out := &in.Required, &out.Required - *out = new(bool) - **out = **in - } - if in.UserDeletionEnabled != nil { - in, out := &in.UserDeletionEnabled, &out.UserDeletionEnabled - *out = new(bool) - **out = **in - } - in.Secret.DeepCopyInto(&out.Secret) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheConfig. -func (in *CheConfig) DeepCopy() *CheConfig { - if in == nil { - return nil - } - out := new(CheConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CheSecret) DeepCopyInto(out *CheSecret) { - *out = *in - in.ToolchainSecret.DeepCopyInto(&out.ToolchainSecret) - if in.CheAdminUsernameKey != nil { - in, out := &in.CheAdminUsernameKey, &out.CheAdminUsernameKey - *out = new(string) - **out = **in - } - if in.CheAdminPasswordKey != nil { - in, out := &in.CheAdminPasswordKey, &out.CheAdminPasswordKey - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheSecret. -func (in *CheSecret) DeepCopy() *CheSecret { - if in == nil { - return nil - } - out := new(CheSecret) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CheStatus) DeepCopyInto(out *CheStatus) { *out = *in @@ -953,7 +886,6 @@ func (in *MemberOperatorConfigSpec) DeepCopyInto(out *MemberOperatorConfigSpec) *out = *in in.Auth.DeepCopyInto(&out.Auth) in.Autoscaler.DeepCopyInto(&out.Autoscaler) - in.Che.DeepCopyInto(&out.Che) in.Console.DeepCopyInto(&out.Console) if in.Environment != nil { in, out := &in.Environment, &out.Environment diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index 33cdfc8f..15ed47c1 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -34,8 +34,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/codeready-toolchain/api/api/v1alpha1.Binding": schema_codeready_toolchain_api_api_v1alpha1_Binding(ref), "github.com/codeready-toolchain/api/api/v1alpha1.BindingRequest": schema_codeready_toolchain_api_api_v1alpha1_BindingRequest(ref), "github.com/codeready-toolchain/api/api/v1alpha1.CaptchaConfig": schema_codeready_toolchain_api_api_v1alpha1_CaptchaConfig(ref), - "github.com/codeready-toolchain/api/api/v1alpha1.CheConfig": schema_codeready_toolchain_api_api_v1alpha1_CheConfig(ref), - "github.com/codeready-toolchain/api/api/v1alpha1.CheSecret": schema_codeready_toolchain_api_api_v1alpha1_CheSecret(ref), "github.com/codeready-toolchain/api/api/v1alpha1.CheStatus": schema_codeready_toolchain_api_api_v1alpha1_CheStatus(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ConsoleConfig": schema_codeready_toolchain_api_api_v1alpha1_ConsoleConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.DeactivationConfig": schema_codeready_toolchain_api_api_v1alpha1_DeactivationConfig(ref), @@ -444,97 +442,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_CaptchaConfig(ref common.Refere } } -func schema_codeready_toolchain_api_api_v1alpha1_CheConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Defines all parameters concerned with Che", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "keycloakRouteName": { - SchemaProps: spec.SchemaProps{ - Description: "Defines the Che/CRW Keycloak route name", - Type: []string{"string"}, - Format: "", - }, - }, - "routeName": { - SchemaProps: spec.SchemaProps{ - Description: "Defines the Che/CRW route name", - Type: []string{"string"}, - Format: "", - }, - }, - "namespace": { - SchemaProps: spec.SchemaProps{ - Description: "Defines the Che/CRW operator namespace", - Type: []string{"string"}, - Format: "", - }, - }, - "required": { - SchemaProps: spec.SchemaProps{ - Description: "Defines a flag that indicates whether the Che/CRW operator is required to be installed on the cluster. May be used in monitoring.", - Type: []string{"boolean"}, - Format: "", - }, - }, - "userDeletionEnabled": { - SchemaProps: spec.SchemaProps{ - Description: "Defines a flag to turn the Che user deletion logic on/off", - Type: []string{"boolean"}, - Format: "", - }, - }, - "secret": { - SchemaProps: spec.SchemaProps{ - Description: "Defines all secrets related to Che configuration", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.CheSecret"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.CheSecret"}, - } -} - -func schema_codeready_toolchain_api_api_v1alpha1_CheSecret(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Defines all secrets related to Che configuration", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "ref": { - SchemaProps: spec.SchemaProps{ - Description: "Reference is the name of the secret resource to look up", - Type: []string{"string"}, - Format: "", - }, - }, - "cheAdminUsernameKey": { - SchemaProps: spec.SchemaProps{ - Description: "The key for the Che admin username in the secret values map", - Type: []string{"string"}, - Format: "", - }, - }, - "cheAdminPasswordKey": { - SchemaProps: spec.SchemaProps{ - Description: "The key for the Che admin password in the secret values map", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - } -} - func schema_codeready_toolchain_api_api_v1alpha1_CheStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -1410,13 +1317,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberOperatorConfigSpec(ref co Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.AutoscalerConfig"), }, }, - "che": { - SchemaProps: spec.SchemaProps{ - Description: "Keeps parameters concerned with Che/CRW", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.CheConfig"), - }, - }, "console": { SchemaProps: spec.SchemaProps{ Description: "Keeps parameters concerned with the console", @@ -1463,7 +1363,7 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberOperatorConfigSpec(ref co }, }, Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.AuthConfig", "github.com/codeready-toolchain/api/api/v1alpha1.AutoscalerConfig", "github.com/codeready-toolchain/api/api/v1alpha1.CheConfig", "github.com/codeready-toolchain/api/api/v1alpha1.ConsoleConfig", "github.com/codeready-toolchain/api/api/v1alpha1.MemberStatusConfig", "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterConfig", "github.com/codeready-toolchain/api/api/v1alpha1.WebhookConfig"}, + "github.com/codeready-toolchain/api/api/v1alpha1.AuthConfig", "github.com/codeready-toolchain/api/api/v1alpha1.AutoscalerConfig", "github.com/codeready-toolchain/api/api/v1alpha1.ConsoleConfig", "github.com/codeready-toolchain/api/api/v1alpha1.MemberStatusConfig", "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterConfig", "github.com/codeready-toolchain/api/api/v1alpha1.WebhookConfig"}, } } @@ -3237,13 +3137,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_Routes(ref common.ReferenceCall Format: "", }, }, - "cheDashboardURL": { - SchemaProps: spec.SchemaProps{ - Description: "CheDashboardURL is the Che Dashboard URL of the cluster if Che is installed", - Type: []string{"string"}, - Format: "", - }, - }, "conditions": { VendorExtensible: spec.VendorExtensible{ Extensions: spec.Extensions{ From 2be085acfe3ecb7c49714871f4b7a6fc5d59b327 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 6 Oct 2025 19:47:16 +0530 Subject: [PATCH 2/3] removing che status Signed-off-by: Feny Mehta --- api/v1alpha1/docs/apiref.adoc | 24 -------------- api/v1alpha1/memberstatus_types.go | 17 ---------- api/v1alpha1/zz_generated.deepcopy.go | 27 --------------- api/v1alpha1/zz_generated.openapi.go | 48 +-------------------------- 4 files changed, 1 insertion(+), 115 deletions(-) diff --git a/api/v1alpha1/docs/apiref.adoc b/api/v1alpha1/docs/apiref.adoc index 553b16b8..572c3d70 100644 --- a/api/v1alpha1/docs/apiref.adoc +++ b/api/v1alpha1/docs/apiref.adoc @@ -288,28 +288,6 @@ Users with captcha score lower than the required one can still be approved manua |=== -[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus"] -==== CheStatus - - - -CheStatus contains information about the status of Che/CRW, such as installed and whether the member configuration is correct - - - -.Appears In: -**** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberstatusstatus[$$MemberStatusStatus$$] -**** - -[cols="20a,50a,15a,15a", options="header"] -|=== -| Field | Description | Default | Validation -| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current Che status conditions + -Supported condition types: ConditionReady + | | -|=== - - [id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-cluster"] ==== Cluster @@ -342,7 +320,6 @@ Supported condition types: ConditionReady + | | .Appears In: **** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus[$$CheStatus$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostoperatorstatus[$$HostOperatorStatus$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostroutes[$$HostRoutes$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hoststatus[$$HostStatus$$] @@ -1198,7 +1175,6 @@ MemberStatusStatus defines the observed state of the toolchain member status [cols="20a,50a,15a,15a", options="header"] |=== | Field | Description | Default | Validation -| *`che`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus[$$CheStatus$$]__ | Che is the status of Che/CRW, such as installed and whether the member configuration is correct + | | | *`memberOperator`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberoperatorstatus[$$MemberOperatorStatus$$]__ | MemberOperator is the status of a toolchain member operator + | | | *`hostConnection`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-toolchainclusterstatus[$$ToolchainClusterStatus$$]__ | HostConnection is the status of the connection with the host cluster + | | | *`host`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hoststatus[$$HostStatus$$]__ | Host is the status of the connection with the host cluster + | | diff --git a/api/v1alpha1/memberstatus_types.go b/api/v1alpha1/memberstatus_types.go index 15994b6e..49c1014b 100644 --- a/api/v1alpha1/memberstatus_types.go +++ b/api/v1alpha1/memberstatus_types.go @@ -21,10 +21,6 @@ type MemberStatusStatus struct { // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file // Add custom validation using kubebuilder tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html - // Che is the status of Che/CRW, such as installed and whether the member configuration is correct - // +optional - Che *CheStatus `json:"che,omitempty"` - // MemberOperator is the status of a toolchain member operator // +optional MemberOperator *MemberOperatorStatus `json:"memberOperator,omitempty"` @@ -55,19 +51,6 @@ type MemberStatusStatus struct { Routes *Routes `json:"routes,omitempty"` } -// CheStatus contains information about the status of Che/CRW, such as installed and whether the member configuration is correct -// +k8s:openapi-gen=true -type CheStatus struct { - // Conditions is an array of current Che status conditions - // Supported condition types: ConditionReady - // +optional - // +patchMergeKey=type - // +patchStrategy=merge - // +listType=map - // +listMapKey=type - Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` -} - // Routes contains information about the public routes available to the user in the cluster // +k8s:openapi-gen=true type Routes struct { diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 98217ca6..4f3f0d8f 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -246,28 +246,6 @@ func (in *CaptchaConfig) DeepCopy() *CaptchaConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CheStatus) DeepCopyInto(out *CheStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]Condition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheStatus. -func (in *CheStatus) DeepCopy() *CheStatus { - if in == nil { - return nil - } - out := new(CheStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Cluster) DeepCopyInto(out *Cluster) { *out = *in @@ -1048,11 +1026,6 @@ func (in *MemberStatusSpec) DeepCopy() *MemberStatusSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MemberStatusStatus) DeepCopyInto(out *MemberStatusStatus) { *out = *in - if in.Che != nil { - in, out := &in.Che, &out.Che - *out = new(CheStatus) - (*in).DeepCopyInto(*out) - } if in.MemberOperator != nil { in, out := &in.MemberOperator, &out.MemberOperator *out = new(MemberOperatorStatus) diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index 15ed47c1..31ad5480 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -34,7 +34,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/codeready-toolchain/api/api/v1alpha1.Binding": schema_codeready_toolchain_api_api_v1alpha1_Binding(ref), "github.com/codeready-toolchain/api/api/v1alpha1.BindingRequest": schema_codeready_toolchain_api_api_v1alpha1_BindingRequest(ref), "github.com/codeready-toolchain/api/api/v1alpha1.CaptchaConfig": schema_codeready_toolchain_api_api_v1alpha1_CaptchaConfig(ref), - "github.com/codeready-toolchain/api/api/v1alpha1.CheStatus": schema_codeready_toolchain_api_api_v1alpha1_CheStatus(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ConsoleConfig": schema_codeready_toolchain_api_api_v1alpha1_ConsoleConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.DeactivationConfig": schema_codeready_toolchain_api_api_v1alpha1_DeactivationConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.FeatureToggle": schema_codeready_toolchain_api_api_v1alpha1_FeatureToggle(ref), @@ -442,45 +441,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_CaptchaConfig(ref common.Refere } } -func schema_codeready_toolchain_api_api_v1alpha1_CheStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "CheStatus contains information about the status of Che/CRW, such as installed and whether the member configuration is correct", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "conditions": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-map-keys": []interface{}{ - "type", - }, - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "Conditions is an array of current Che status conditions Supported condition types: ConditionReady", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.Condition"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.Condition"}, - } -} - func schema_codeready_toolchain_api_api_v1alpha1_ConsoleConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -1472,12 +1432,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberStatusStatus(ref common.R Description: "MemberStatusStatus defines the observed state of the toolchain member status", Type: []string{"object"}, Properties: map[string]spec.Schema{ - "che": { - SchemaProps: spec.SchemaProps{ - Description: "Che is the status of Che/CRW, such as installed and whether the member configuration is correct", - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.CheStatus"), - }, - }, "memberOperator": { SchemaProps: spec.SchemaProps{ Description: "MemberOperator is the status of a toolchain member operator", @@ -1537,7 +1491,7 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberStatusStatus(ref common.R }, }, Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.CheStatus", "github.com/codeready-toolchain/api/api/v1alpha1.Condition", "github.com/codeready-toolchain/api/api/v1alpha1.HostStatus", "github.com/codeready-toolchain/api/api/v1alpha1.MemberOperatorStatus", "github.com/codeready-toolchain/api/api/v1alpha1.ResourceUsage", "github.com/codeready-toolchain/api/api/v1alpha1.Routes", "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterStatus"}, + "github.com/codeready-toolchain/api/api/v1alpha1.Condition", "github.com/codeready-toolchain/api/api/v1alpha1.HostStatus", "github.com/codeready-toolchain/api/api/v1alpha1.MemberOperatorStatus", "github.com/codeready-toolchain/api/api/v1alpha1.ResourceUsage", "github.com/codeready-toolchain/api/api/v1alpha1.Routes", "github.com/codeready-toolchain/api/api/v1alpha1.ToolchainClusterStatus"}, } } From 82330f2fccd3e32ac8bd4bcf2f4de479ae07ab32 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Tue, 7 Oct 2025 12:34:03 +0530 Subject: [PATCH 3/3] leftover constants & comments Signed-off-by: Feny Mehta --- api/v1alpha1/docs/apiref.adoc | 2 +- api/v1alpha1/memberstatus_types.go | 2 +- api/v1alpha1/toolchainstatus_types.go | 14 ++++---------- api/v1alpha1/zz_generated.openapi.go | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/api/v1alpha1/docs/apiref.adoc b/api/v1alpha1/docs/apiref.adoc index 572c3d70..a45b17da 100644 --- a/api/v1alpha1/docs/apiref.adoc +++ b/api/v1alpha1/docs/apiref.adoc @@ -1181,7 +1181,7 @@ MemberStatusStatus defines the observed state of the toolchain member status | *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current toolchain status conditions + Supported condition types: ConditionReady + | | | *`resourceUsage`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-resourceusage[$$ResourceUsage$$]__ | Resource usage of the cluster + | | -| *`routes`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes[$$Routes$$]__ | Routes/URLs of the cluster, such as Console and Che Dashboard URLs + | | +| *`routes`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes[$$Routes$$]__ | Routes/URLs of the cluster, such as Console + | | |=== diff --git a/api/v1alpha1/memberstatus_types.go b/api/v1alpha1/memberstatus_types.go index 49c1014b..84cc502a 100644 --- a/api/v1alpha1/memberstatus_types.go +++ b/api/v1alpha1/memberstatus_types.go @@ -46,7 +46,7 @@ type MemberStatusStatus struct { // +optional ResourceUsage ResourceUsage `json:"resourceUsage,omitempty"` - // Routes/URLs of the cluster, such as Console and Che Dashboard URLs + // Routes/URLs of the cluster, such as Console // +optional Routes *Routes `json:"routes,omitempty"` } diff --git a/api/v1alpha1/toolchainstatus_types.go b/api/v1alpha1/toolchainstatus_types.go index fc7b7ad8..e21d555e 100644 --- a/api/v1alpha1/toolchainstatus_types.go +++ b/api/v1alpha1/toolchainstatus_types.go @@ -48,16 +48,10 @@ const ( ToolchainStatusHostRoutesAvailableReason = "HostRoutesAvailable" // member status reasons - ToolchainStatusMemberStatusNotFoundReason = "MemberStatusNotFound" - ToolchainStatusMemberToolchainClusterMissingReason = "MemberToolchainClusterMissing" - ToolchainStatusMemberStatusConsoleRouteUnavailableReason = "ConsoleRouteUnavailable" - ToolchainStatusMemberStatusRoutesAvailableReason = "RoutesAvailable" - ToolchainStatusMemberStatusCheRouteUnavailableReason = "CheRouteUnavailable" - ToolchainStatusMemberStatusCheUserAPICheckFailedReason = "CheUserAPICheckFailed" - ToolchainStatusMemberStatusCheNotRequiredReason = "CheNotRequired" - ToolchainStatusMemberStatusCheAdminUserNotConfiguredReason = "CheAdminUserNotConfigured" - ToolchainStatusMemberStatusCheUserDeletionNotEnabledReason = "CheUserDeletionNotEnabled" - ToolchainStatusMemberStatusCheReadyReason = "CheReady" + ToolchainStatusMemberStatusNotFoundReason = "MemberStatusNotFound" + ToolchainStatusMemberToolchainClusterMissingReason = "MemberToolchainClusterMissing" + ToolchainStatusMemberStatusConsoleRouteUnavailableReason = "ConsoleRouteUnavailable" + ToolchainStatusMemberStatusRoutesAvailableReason = "RoutesAvailable" // Metric Keys // MasterUserRecordsPerDomainMetricKey the key to store the metric for the number of MasterUserRecords per email address domain diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index 31ad5480..367de928 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -1483,7 +1483,7 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberStatusStatus(ref common.R }, "routes": { SchemaProps: spec.SchemaProps{ - Description: "Routes/URLs of the cluster, such as Console and Che Dashboard URLs", + Description: "Routes/URLs of the cluster, such as Console", Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.Routes"), }, },