From ed4387f19137ddd2ac7e36cc0e061bd2316ec3d9 Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Thu, 1 Aug 2024 18:02:01 +0200 Subject: [PATCH] remove webConsolePlugin from ToolchainClusterConfig (#438) Pendo has been decommisioned, we don't need this plugin anymore Signed-off-by: Xavier Coulon --- api/v1alpha1/docs/apiref.adoc | 24 ----------------- api/v1alpha1/memberoperatorconfig_types.go | 18 ------------- api/v1alpha1/zz_generated.deepcopy.go | 31 ---------------------- api/v1alpha1/zz_generated.openapi.go | 9 +------ 4 files changed, 1 insertion(+), 81 deletions(-) diff --git a/api/v1alpha1/docs/apiref.adoc b/api/v1alpha1/docs/apiref.adoc index feaabc54..2b9163d4 100644 --- a/api/v1alpha1/docs/apiref.adoc +++ b/api/v1alpha1/docs/apiref.adoc @@ -1069,7 +1069,6 @@ MemberOperatorConfigSpec contains all configuration parameters of the member ope | *`memberStatus`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberstatusconfig[$$MemberStatusConfig$$]__ | Keeps parameters concerned with member status + | | | *`toolchainCluster`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-toolchainclusterconfig[$$ToolchainClusterConfig$$]__ | Keeps parameters concerned with the toolchaincluster + | | | *`webhook`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-webhookconfig[$$WebhookConfig$$]__ | Keeps parameters concerned with the webhook + | | -| *`webConsolePlugin`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-webconsoleplugin[$$WebConsolePlugin$$]__ | WebConsolePlugin is used to configure the Web Console Plugin parameters + | | |=== @@ -3903,29 +3902,6 @@ username has a forbidden suffix, then the username compliance suffix is added to |=== -[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-webconsoleplugin"] -==== WebConsolePlugin - - - -WebConsolePlugin defines the configuration parameters relating to the Web Console Plugin - - - -.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 -| *`deploy`* __boolean__ | Deploy determines whether the plugin will be deployed or not + | | -| *`pendoKey`* __string__ | PendoKey is the key value used to interact with the Pendo API + | | -| *`pendoHost`* __string__ | PendoHost allows a host URL to be configured instead of communicating directly with the Pendo domain + | | -|=== - - [id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-webhookconfig"] ==== WebhookConfig diff --git a/api/v1alpha1/memberoperatorconfig_types.go b/api/v1alpha1/memberoperatorconfig_types.go index 6e0d71fd..c8d29145 100644 --- a/api/v1alpha1/memberoperatorconfig_types.go +++ b/api/v1alpha1/memberoperatorconfig_types.go @@ -42,10 +42,6 @@ type MemberOperatorConfigSpec struct { // Keeps parameters concerned with the webhook // +optional Webhook WebhookConfig `json:"webhook,omitempty"` - - // WebConsolePlugin is used to configure the Web Console Plugin parameters - // +optional - WebConsolePlugin WebConsolePlugin `json:"webConsolePlugin,omitempty"` } // Defines all parameters concerned with the autoscaler @@ -177,20 +173,6 @@ type WebhookSecret struct { VirtualMachineAccessKey *string `json:"virtualMachineAccessKey,omitempty"` } -// WebConsolePlugin defines the configuration parameters relating to the Web Console Plugin -type WebConsolePlugin struct { - // Deploy determines whether the plugin will be deployed or not - Deploy *bool `json:"deploy,omitempty"` - - // PendoKey is the key value used to interact with the Pendo API - // +optional - PendoKey *string `json:"pendoKey,omitempty"` - - // PendoHost allows a host URL to be configured instead of communicating directly with the Pendo domain - // +optional - PendoHost *string `json:"pendoHost,omitempty"` -} - // Defines all parameters concerned with member status // +k8s:openapi-gen=true type MemberStatusConfig struct { diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index c5ee8a71..2d4bfa6b 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -949,7 +949,6 @@ func (in *MemberOperatorConfigSpec) DeepCopyInto(out *MemberOperatorConfigSpec) in.MemberStatus.DeepCopyInto(&out.MemberStatus) in.ToolchainCluster.DeepCopyInto(&out.ToolchainCluster) in.Webhook.DeepCopyInto(&out.Webhook) - in.WebConsolePlugin.DeepCopyInto(&out.WebConsolePlugin) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MemberOperatorConfigSpec. @@ -3828,36 +3827,6 @@ func (in *UsersConfig) DeepCopy() *UsersConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *WebConsolePlugin) DeepCopyInto(out *WebConsolePlugin) { - *out = *in - if in.Deploy != nil { - in, out := &in.Deploy, &out.Deploy - *out = new(bool) - **out = **in - } - if in.PendoKey != nil { - in, out := &in.PendoKey, &out.PendoKey - *out = new(string) - **out = **in - } - if in.PendoHost != nil { - in, out := &in.PendoHost, &out.PendoHost - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WebConsolePlugin. -func (in *WebConsolePlugin) DeepCopy() *WebConsolePlugin { - if in == nil { - return nil - } - out := new(WebConsolePlugin) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *WebhookConfig) DeepCopyInto(out *WebhookConfig) { *out = *in diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go index d8878fbf..664f5ea1 100644 --- a/api/v1alpha1/zz_generated.openapi.go +++ b/api/v1alpha1/zz_generated.openapi.go @@ -1463,18 +1463,11 @@ func schema_codeready_toolchain_api_api_v1alpha1_MemberOperatorConfigSpec(ref co Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.WebhookConfig"), }, }, - "webConsolePlugin": { - SchemaProps: spec.SchemaProps{ - Description: "WebConsolePlugin is used to configure the Web Console Plugin parameters", - Default: map[string]interface{}{}, - Ref: ref("github.com/codeready-toolchain/api/api/v1alpha1.WebConsolePlugin"), - }, - }, }, }, }, 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.WebConsolePlugin", "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.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"}, } }