From c03e305d17dc9d5696ccf6ea5556c49b6fc42c92 Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Wed, 29 Jul 2026 15:44:46 +0200 Subject: [PATCH] refactor: remove the 'RevisionCheck' and 'GitHubSecret' types not used anymore after merging https://github.com/codeready-toolchain/host-operator/pull/1281 and https://github.com/codeready-toolchain/member-operator/pull/755 Signed-off-by: Xavier Coulon --- api/v1alpha1/docs/apiref.adoc | 64 +------------ api/v1alpha1/memberoperatorconfig_types.go | 16 ---- api/v1alpha1/memberstatus_types.go | 4 - api/v1alpha1/toolchainconfig_types.go | 4 - api/v1alpha1/toolchainstatus_types.go | 36 ++----- api/v1alpha1/zz_generated.deepcopy.go | 48 ---------- api/v1alpha1/zz_generated.openapi.go | 106 +-------------------- 7 files changed, 10 insertions(+), 268 deletions(-) diff --git a/api/v1alpha1/docs/apiref.adoc b/api/v1alpha1/docs/apiref.adoc index 25bc225d..a457579c 100644 --- a/api/v1alpha1/docs/apiref.adoc +++ b/api/v1alpha1/docs/apiref.adoc @@ -390,7 +390,6 @@ Users with captcha score lower than the required one can still be approved manua - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicedeploymentstatus[$$RegistrationServiceDeploymentStatus$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicehealth[$$RegistrationServiceHealth$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceresourcesstatus[$$RegistrationServiceResourcesStatus$$] -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes[$$Routes$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-socialeventstatus[$$SocialEventStatus$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-spacebindingrequeststatus[$$SpaceBindingRequestStatus$$] @@ -585,31 +584,6 @@ Optional: \{} + |=== -[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret"] -==== GitHubSecret - - - -GitHubSecret defines all secrets related to GitHub authentication/integration - - - -.Appears In: -**** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberstatusconfig[$$MemberStatusConfig$$] -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-toolchainstatusconfig[$$ToolchainStatusConfig$$] -**** - -[cols="20a,50a,15a,15a", options="header"] -|=== -| Field | Description | Default | Validation -| *`ref`* __string__ | Reference is the name of the secret resource to look up + | | Optional: \{} + - -| *`accessTokenKey`* __string__ | The key for the GitHub Access token in the secret values map + | | Optional: \{} + - -|=== - - [id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostconfig"] ==== HostConfig @@ -659,6 +633,7 @@ the same permissions the kubesaw-authenticated user has. + | | Optional: \{} + HostOperatorStatus defines the observed state of a toolchain's host operator +DEPRECATED: using metrics instead of this status @@ -677,8 +652,6 @@ HostOperatorStatus defines the observed state of a toolchain's host operator | *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current host operator status conditions + Supported condition types: ConditionReady + | | Optional: \{} + -| *`revisionCheck`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]__ | The status of the revision check for host operator's deployment + | | Optional: \{} + - |=== @@ -702,8 +675,6 @@ HostRegistrationServiceStatus defines the observed state of a toolchain's regist | *`deployment`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicedeploymentstatus[$$RegistrationServiceDeploymentStatus$$]__ | Deployment is the status of the registration service's deployment + | | | *`registrationServiceResources`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceresourcesstatus[$$RegistrationServiceResourcesStatus$$]__ | RegistrationServiceResources is the status for resources created for the registration service + | | | *`health`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicehealth[$$RegistrationServiceHealth$$]__ | Health provides health status of the registration service + | | -| *`revisionCheck`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]__ | The status of the revision check for registration service + | | Optional: \{} + - |=== @@ -1172,8 +1143,6 @@ MemberOperatorStatus defines the observed state of a toolchain's member operator | *`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 + | | Optional: \{} + -| *`revisionCheck`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]__ | The status of the revision check for member operator's deployment + | | Optional: \{} + - |=== @@ -1223,8 +1192,6 @@ Defines all parameters concerned with member status | Field | Description | Default | Validation | *`refreshPeriod`* __string__ | Defines the period between refreshes of the member status + | | Optional: \{} + -| *`gitHubSecret`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$]__ | Defines all secrets related to GitHub authentication/integration + | | Optional: \{} + - |=== @@ -2405,32 +2372,6 @@ Contains information about the resource usage of the cluster |=== -[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck"] -==== RevisionCheck - - - -RevisionCheck contains status of revision check for the component, -it highlights if the component is up-to-date and the deployed version matches the latest one in the GitHub repository. - - - -.Appears In: -**** -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostoperatorstatus[$$HostOperatorStatus$$] -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostregistrationservicestatus[$$HostRegistrationServiceStatus$$] -- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberoperatorstatus[$$MemberOperatorStatus$$] -**** - -[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 status conditions for the health of the registration service + -Supported condition types: ConditionReady + | | Optional: \{} + - -|=== - - [id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes"] ==== Routes @@ -3624,7 +3565,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-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$$] - xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-webhooksecret[$$WebhookSecret$$] @@ -3684,8 +3624,6 @@ ToolchainStatusConfig contains all configuration parameters related to the toolc | Field | Description | Default | Validation | *`toolchainStatusRefreshTime`* __string__ | ToolchainStatusRefreshTime specifies how often the ToolchainStatus should load and refresh the current hosted-toolchain status + | | Optional: \{} + -| *`gitHubSecret`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$]__ | Defines all secrets related to GitHub authentication/integration + | | Optional: \{} + - |=== diff --git a/api/v1alpha1/memberoperatorconfig_types.go b/api/v1alpha1/memberoperatorconfig_types.go index 5329e772..f1f9f229 100644 --- a/api/v1alpha1/memberoperatorconfig_types.go +++ b/api/v1alpha1/memberoperatorconfig_types.go @@ -80,18 +80,6 @@ type ConsoleConfig struct { RouteName *string `json:"routeName,omitempty"` } -// GitHubSecret defines all secrets related to GitHub authentication/integration -// +k8s:openapi-gen=true -type GitHubSecret struct { - // The reference to the secret that is expected to contain the keys below - // +optional - ToolchainSecret `json:",inline"` - - // The key for the GitHub Access token in the secret values map - // +optional - AccessTokenKey *string `json:"accessTokenKey,omitempty"` -} - // Defines all parameters concerned with the toolchaincluster resource // +k8s:openapi-gen=true type ToolchainClusterConfig struct { @@ -135,10 +123,6 @@ type MemberStatusConfig struct { // Defines the period between refreshes of the member status // +optional RefreshPeriod *string `json:"refreshPeriod,omitempty"` - - // Defines all secrets related to GitHub authentication/integration - // +optional - GitHubSecret GitHubSecret `json:"gitHubSecret,omitempty"` } // MemberOperatorConfigStatus defines the observed state of MemberOperatorConfig diff --git a/api/v1alpha1/memberstatus_types.go b/api/v1alpha1/memberstatus_types.go index 84cc502a..af7bc2ac 100644 --- a/api/v1alpha1/memberstatus_types.go +++ b/api/v1alpha1/memberstatus_types.go @@ -116,10 +116,6 @@ type MemberOperatorStatus struct { // +listType=map // +listMapKey=type Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` - - // The status of the revision check for member operator's deployment - // +optional - RevisionCheck RevisionCheck `json:"revisionCheck"` } //+kubebuilder:object:root=true diff --git a/api/v1alpha1/toolchainconfig_types.go b/api/v1alpha1/toolchainconfig_types.go index aad5fff1..ce5e503a 100644 --- a/api/v1alpha1/toolchainconfig_types.go +++ b/api/v1alpha1/toolchainconfig_types.go @@ -499,10 +499,6 @@ type ToolchainStatusConfig struct { // ToolchainStatusRefreshTime specifies how often the ToolchainStatus should load and refresh the current hosted-toolchain status // +optional ToolchainStatusRefreshTime *string `json:"toolchainStatusRefreshTime,omitempty"` - - // Defines all secrets related to GitHub authentication/integration - // +optional - GitHubSecret GitHubSecret `json:"gitHubSecret,omitempty"` } // TiersConfig contains all configuration parameters related to tiers diff --git a/api/v1alpha1/toolchainstatus_types.go b/api/v1alpha1/toolchainstatus_types.go index 3ca12089..bded95d7 100644 --- a/api/v1alpha1/toolchainstatus_types.go +++ b/api/v1alpha1/toolchainstatus_types.go @@ -24,14 +24,11 @@ const ( ToolchainStatusComponentsNotReadyReason = "ComponentsNotReady" // deployment reasons - ToolchainStatusDeploymentReadyReason = "DeploymentReady" - ToolchainStatusDeploymentNotReadyReason = "DeploymentNotReady" - ToolchainStatusDeploymentNotFoundReason = "DeploymentNotFound" - ToolchainStatusDeploymentNotUpToDateReason = "DeploymentNotUpToDate" - ToolchainStatusDeploymentUpToDateReason = "DeploymentIsUpToDate" - ToolchainStatusDeploymentRevisionCheckDisabledReason = "DeploymentRevisionCheckDisabled" - ToolchainStatusDeploymentRevisionCheckGitHubErrorReason = "DeploymentRevisionCheckGitHubError" - ToolchainStatusDeploymentRevisionCheckOperatorErrorReason = "DeploymentRevisionCheckOperatorError" + ToolchainStatusDeploymentReadyReason = "DeploymentReady" + ToolchainStatusDeploymentNotReadyReason = "DeploymentNotReady" + ToolchainStatusDeploymentNotFoundReason = "DeploymentNotFound" + ToolchainStatusDeploymentNotUpToDateReason = "DeploymentNotUpToDate" + ToolchainStatusDeploymentUpToDateReason = "DeploymentIsUpToDate" // host connection reasons ToolchainStatusClusterConnectionReadyReason = "HostConnectionReady" @@ -120,6 +117,7 @@ type HostRoutes struct { // HostOperatorStatus defines the observed state of a toolchain's host operator // +k8s:openapi-gen=true +// DEPRECATED: using metrics instead of this status type HostOperatorStatus 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 @@ -144,10 +142,6 @@ type HostOperatorStatus struct { // +listType=map // +listMapKey=type Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` - - // The status of the revision check for host operator's deployment - // +optional - RevisionCheck RevisionCheck `json:"revisionCheck"` } // HostRegistrationServiceStatus defines the observed state of a toolchain's registration service @@ -164,10 +158,6 @@ type HostRegistrationServiceStatus struct { // Health provides health status of the registration service Health RegistrationServiceHealth `json:"health"` - - // The status of the revision check for registration service - // +optional - RevisionCheck RevisionCheck `json:"revisionCheck"` } // RegistrationServiceDeploymentStatus contains status of the registration service's deployment @@ -232,20 +222,6 @@ type RegistrationServiceResourcesStatus struct { Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` } -// RevisionCheck contains status of revision check for the component, -// it highlights if the component is up-to-date and the deployed version matches the latest one in the GitHub repository. -// +k8s:openapi-gen=true -type RevisionCheck struct { - // Conditions is an array of status conditions for the health of the registration service - // Supported condition types: ConditionReady - // +optional - // +patchMergeKey=type - // +patchStrategy=merge - // +listType=map - // +listMapKey=type - Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"` -} - //+kubebuilder:object:root=true //+kubebuilder:subresource:status diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index f12dc336..73ff76e8 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -438,27 +438,6 @@ func (in *FeatureToggle) DeepCopy() *FeatureToggle { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GitHubSecret) DeepCopyInto(out *GitHubSecret) { - *out = *in - in.ToolchainSecret.DeepCopyInto(&out.ToolchainSecret) - if in.AccessTokenKey != nil { - in, out := &in.AccessTokenKey, &out.AccessTokenKey - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitHubSecret. -func (in *GitHubSecret) DeepCopy() *GitHubSecret { - if in == nil { - return nil - } - out := new(GitHubSecret) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HostConfig) DeepCopyInto(out *HostConfig) { *out = *in @@ -502,7 +481,6 @@ func (in *HostOperatorStatus) DeepCopyInto(out *HostOperatorStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - in.RevisionCheck.DeepCopyInto(&out.RevisionCheck) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostOperatorStatus. @@ -521,7 +499,6 @@ func (in *HostRegistrationServiceStatus) DeepCopyInto(out *HostRegistrationServi in.Deployment.DeepCopyInto(&out.Deployment) in.RegistrationServiceResources.DeepCopyInto(&out.RegistrationServiceResources) in.Health.DeepCopyInto(&out.Health) - in.RevisionCheck.DeepCopyInto(&out.RevisionCheck) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostRegistrationServiceStatus. @@ -949,7 +926,6 @@ func (in *MemberOperatorStatus) DeepCopyInto(out *MemberOperatorStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - in.RevisionCheck.DeepCopyInto(&out.RevisionCheck) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MemberOperatorStatus. @@ -997,7 +973,6 @@ func (in *MemberStatusConfig) DeepCopyInto(out *MemberStatusConfig) { *out = new(string) **out = **in } - in.GitHubSecret.DeepCopyInto(&out.GitHubSecret) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MemberStatusConfig. @@ -2207,28 +2182,6 @@ func (in *ResourceUsage) DeepCopy() *ResourceUsage { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RevisionCheck) DeepCopyInto(out *RevisionCheck) { - *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 RevisionCheck. -func (in *RevisionCheck) DeepCopy() *RevisionCheck { - if in == nil { - return nil - } - out := new(RevisionCheck) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Routes) DeepCopyInto(out *Routes) { *out = *in @@ -3408,7 +3361,6 @@ func (in *ToolchainStatusConfig) DeepCopyInto(out *ToolchainStatusConfig) { *out = new(string) **out = **in } - in.GitHubSecret.DeepCopyInto(&out.GitHubSecret) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ToolchainStatusConfig. diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index 96caffd0..b2ce12c8 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -37,7 +37,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "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), - "github.com/codeready-toolchain/api/api/v1alpha1.GitHubSecret": schema_codeready_toolchain_api_api_v1alpha1_GitHubSecret(ref), "github.com/codeready-toolchain/api/api/v1alpha1.HostConfig": schema_codeready_toolchain_api_api_v1alpha1_HostConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.HostOperatorStatus": schema_codeready_toolchain_api_api_v1alpha1_HostOperatorStatus(ref), "github.com/codeready-toolchain/api/api/v1alpha1.HostRegistrationServiceStatus": schema_codeready_toolchain_api_api_v1alpha1_HostRegistrationServiceStatus(ref), @@ -86,7 +85,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceVerificationConfig": schema_codeready_toolchain_api_api_v1alpha1_RegistrationServiceVerificationConfig(ref), "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceVerificationSecret": schema_codeready_toolchain_api_api_v1alpha1_RegistrationServiceVerificationSecret(ref), "github.com/codeready-toolchain/api/api/v1alpha1.ResourceUsage": schema_codeready_toolchain_api_api_v1alpha1_ResourceUsage(ref), - "github.com/codeready-toolchain/api/api/v1alpha1.RevisionCheck": schema_codeready_toolchain_api_api_v1alpha1_RevisionCheck(ref), "github.com/codeready-toolchain/api/api/v1alpha1.Routes": schema_codeready_toolchain_api_api_v1alpha1_Routes(ref), "github.com/codeready-toolchain/api/api/v1alpha1.SocialEvent": schema_codeready_toolchain_api_api_v1alpha1_SocialEvent(ref), "github.com/codeready-toolchain/api/api/v1alpha1.SocialEventSpec": schema_codeready_toolchain_api_api_v1alpha1_SocialEventSpec(ref), @@ -537,33 +535,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_FeatureToggle(ref common.Refere } } -func schema_codeready_toolchain_api_api_v1alpha1_GitHubSecret(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GitHubSecret defines all secrets related to GitHub authentication/integration", - 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: "", - }, - }, - "accessTokenKey": { - SchemaProps: spec.SchemaProps{ - Description: "The key for the GitHub Access token in the secret values map", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - } -} - func schema_codeready_toolchain_api_api_v1alpha1_HostConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -652,7 +623,7 @@ func schema_codeready_toolchain_api_api_v1alpha1_HostOperatorStatus(ref common.R return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "HostOperatorStatus defines the observed state of a toolchain's host operator", + Description: "HostOperatorStatus defines the observed state of a toolchain's host operator DEPRECATED: using metrics instead of this status", Type: []string{"object"}, Properties: map[string]spec.Schema{ "version": { @@ -711,19 +682,12 @@ func schema_codeready_toolchain_api_api_v1alpha1_HostOperatorStatus(ref common.R }, }, }, - "revisionCheck": { - SchemaProps: spec.SchemaProps{ - Description: "The status of the revision check for host operator's deployment", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.RevisionCheck"), - }, - }, }, Required: []string{"version", "revision", "buildTimestamp", "deploymentName"}, }, }, Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.Condition", "github.com/codeready-toolchain/api/api/v1alpha1.RevisionCheck"}, + "github.com/codeready-toolchain/api/api/v1alpha1.Condition"}, } } @@ -755,19 +719,12 @@ func schema_codeready_toolchain_api_api_v1alpha1_HostRegistrationServiceStatus(r Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceHealth"), }, }, - "revisionCheck": { - SchemaProps: spec.SchemaProps{ - Description: "The status of the revision check for registration service", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.RevisionCheck"), - }, - }, }, Required: []string{"deployment", "registrationServiceResources", "health"}, }, }, Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceDeploymentStatus", "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceHealth", "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceResourcesStatus", "github.com/codeready-toolchain/api/api/v1alpha1.RevisionCheck"}, + "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceDeploymentStatus", "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceHealth", "github.com/codeready-toolchain/api/api/v1alpha1.RegistrationServiceResourcesStatus"}, } } @@ -1384,18 +1341,9 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberStatusConfig(ref common.R Format: "", }, }, - "gitHubSecret": { - SchemaProps: spec.SchemaProps{ - Description: "Defines all secrets related to GitHub authentication/integration", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.GitHubSecret"), - }, - }, }, }, }, - Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.GitHubSecret"}, } } @@ -3071,45 +3019,6 @@ func schema_codeready_toolchain_api_api_v1alpha1_ResourceUsage(ref common.Refere } } -func schema_codeready_toolchain_api_api_v1alpha1_RevisionCheck(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "RevisionCheck contains status of revision check for the component, it highlights if the component is up-to-date and the deployed version matches the latest one in the GitHub repository.", - 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 status conditions for the health of the registration service 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_Routes(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -4691,18 +4600,9 @@ func schema_codeready_toolchain_api_api_v1alpha1_ToolchainStatusConfig(ref commo Format: "", }, }, - "gitHubSecret": { - SchemaProps: spec.SchemaProps{ - Description: "Defines all secrets related to GitHub authentication/integration", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.GitHubSecret"), - }, - }, }, }, }, - Dependencies: []string{ - "github.com/codeready-toolchain/api/api/v1alpha1.GitHubSecret"}, } }