From 9bca90e0f55f3db7588a5bb3039de3fd54245898 Mon Sep 17 00:00:00 2001 From: sophon Date: Thu, 12 Dec 2024 15:06:50 +0800 Subject: [PATCH] chore: rename parameterdrivenconfigrender to paramconfigrenderer and removed injectEnvTo api --- PROJECT | 8 +- ..._types.go => paramconfigrenderer_types.go} | 38 ++-- .../v1alpha1/zz_generated.deepcopy.go | 137 +++++++------ cmd/manager/main.go | 2 +- ...s.kubeblocks.io_paramconfigrenderers.yaml} | 34 +--- config/crd/kustomization.yaml | 6 +- ...n_in_parameters_paramconfigrenderers.yaml} | 2 +- ...k_in_parameters_paramconfigrenderers.yaml} | 2 +- ...ters_paramconfigrenderer_editor_role.yaml} | 10 +- ...ters_paramconfigrenderer_viewer_role.yaml} | 10 +- config/rbac/role.yaml | 6 +- ...ameters_v1alpha1_paramconfigrenderer.yaml} | 8 +- .../parameters/config_reconcile_wrapper.go | 2 +- controllers/parameters/configuration_test.go | 2 +- ...r.go => paramconfigrenderer_controller.go} | 24 +-- ...=> paramconfigrenderer_controller_test.go} | 18 +- .../parametersdefinition_controller.go | 2 +- deploy/helm/config/rbac/role.yaml | 6 +- ...s.kubeblocks.io_paramconfigrenderers.yaml} | 34 +--- .../v1alpha1/fake/fake_paramconfigrenderer.go | 132 +++++++++++++ .../fake/fake_parameterdrivenconfigrender.go | 132 ------------- .../v1alpha1/fake/fake_parameters_client.go | 8 +- .../v1alpha1/generated_expansion.go | 4 +- .../v1alpha1/paramconfigrenderer.go | 184 ++++++++++++++++++ .../v1alpha1/parameterdrivenconfigrender.go | 184 ------------------ .../parameters/v1alpha1/parameters_client.go | 10 +- .../informers/externalversions/generic.go | 4 +- .../parameters/v1alpha1/interface.go | 14 +- ...configrender.go => paramconfigrenderer.go} | 38 ++-- .../v1alpha1/expansion_generated.go | 8 +- .../v1alpha1/paramconfigrenderer.go | 68 +++++++ .../v1alpha1/parameterdrivenconfigrender.go | 68 ------- pkg/controllerutil/config_util.go | 10 +- pkg/controllerutil/parameter_schema.go | 6 +- pkg/generics/type.go | 2 +- ...tory.go => paramconfigrenderer_factory.go} | 34 ++-- 36 files changed, 598 insertions(+), 659 deletions(-) rename apis/parameters/v1alpha1/{parameterdrivenconfigrender_types.go => paramconfigrenderer_types.go} (75%) rename config/crd/bases/{parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml => parameters.kubeblocks.io_paramconfigrenderers.yaml} (84%) rename config/crd/patches/{cainjection_in_parameters_parameterdrivenconfigrenders.yaml => cainjection_in_parameters_paramconfigrenderers.yaml} (80%) rename config/crd/patches/{webhook_in_parameters_parameterdrivenconfigrenders.yaml => webhook_in_parameters_paramconfigrenderers.yaml} (85%) rename config/rbac/{parameters_parameterdrivenconfigrender_editor_role.yaml => parameters_paramconfigrenderer_editor_role.yaml} (65%) rename config/rbac/{parameters_parameterdrivenconfigrender_viewer_role.yaml => parameters_paramconfigrenderer_viewer_role.yaml} (63%) rename config/samples/{parameters_v1alpha1_parameterdrivenconfigrender.yaml => parameters_v1alpha1_paramconfigrenderer.yaml} (54%) rename controllers/parameters/{parameterdrivenconfigrender_controller.go => paramconfigrenderer_controller.go} (88%) rename controllers/parameters/{parameterdrivenconfigrender_controller_test.go => paramconfigrenderer_controller_test.go} (84%) rename deploy/helm/crds/{parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml => parameters.kubeblocks.io_paramconfigrenderers.yaml} (84%) create mode 100644 pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_paramconfigrenderer.go delete mode 100644 pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameterdrivenconfigrender.go create mode 100644 pkg/client/clientset/versioned/typed/parameters/v1alpha1/paramconfigrenderer.go delete mode 100644 pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameterdrivenconfigrender.go rename pkg/client/informers/externalversions/parameters/v1alpha1/{parameterdrivenconfigrender.go => paramconfigrenderer.go} (52%) create mode 100644 pkg/client/listers/parameters/v1alpha1/paramconfigrenderer.go delete mode 100644 pkg/client/listers/parameters/v1alpha1/parameterdrivenconfigrender.go rename pkg/testutil/parameters/{parameterdrivenconfigrenders_factory.go => paramconfigrenderer_factory.go} (59%) diff --git a/PROJECT b/PROJECT index 18b84d5cbc9..83701091e02 100644 --- a/PROJECT +++ b/PROJECT @@ -335,10 +335,11 @@ resources: version: v1alpha1 - api: crdVersion: v1 + namespaced: true controller: true domain: kubeblocks.io group: parameters - kind: ParameterDrivenConfigRender + kind: ComponentParameter path: github.com/apecloud/kubeblocks/apis/parameters/v1alpha1 version: v1alpha1 - api: @@ -347,16 +348,15 @@ resources: controller: true domain: kubeblocks.io group: parameters - kind: ComponentParameter + kind: Parameter path: github.com/apecloud/kubeblocks/apis/parameters/v1alpha1 version: v1alpha1 - api: crdVersion: v1 - namespaced: true controller: true domain: kubeblocks.io group: parameters - kind: Parameter + kind: ParamConfigRenderer path: github.com/apecloud/kubeblocks/apis/parameters/v1alpha1 version: v1alpha1 version: "3" diff --git a/apis/parameters/v1alpha1/parameterdrivenconfigrender_types.go b/apis/parameters/v1alpha1/paramconfigrenderer_types.go similarity index 75% rename from apis/parameters/v1alpha1/parameterdrivenconfigrender_types.go rename to apis/parameters/v1alpha1/paramconfigrenderer_types.go index 5311b9dea72..f1d0c5344b4 100644 --- a/apis/parameters/v1alpha1/parameterdrivenconfigrender_types.go +++ b/apis/parameters/v1alpha1/paramconfigrenderer_types.go @@ -34,30 +34,30 @@ import ( // +kubebuilder:printcolumn:name="PHASE",type="string",JSONPath=".status.phase",description="status phase" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" -// ParameterDrivenConfigRender is the Schema for the parameterdrivenconfigrenders API -type ParameterDrivenConfigRender struct { +// ParamConfigRenderer is the Schema for the paramconfigrenderers API +type ParamConfigRenderer struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec ParameterDrivenConfigRenderSpec `json:"spec,omitempty"` - Status ParameterDrivenConfigRenderStatus `json:"status,omitempty"` + Spec ParamConfigRendererSpec `json:"spec,omitempty"` + Status ParamConfigRendererStatus `json:"status,omitempty"` } // +kubebuilder:object:root=true -// ParameterDrivenConfigRenderList contains a list of ParameterDrivenConfigRender -type ParameterDrivenConfigRenderList struct { +// ParamConfigRendererList contains a list of ParamConfigRenderer +type ParamConfigRendererList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []ParameterDrivenConfigRender `json:"items"` + Items []ParamConfigRenderer `json:"items"` } func init() { - SchemeBuilder.Register(&ParameterDrivenConfigRender{}, &ParameterDrivenConfigRenderList{}) + SchemeBuilder.Register(&ParamConfigRenderer{}, &ParamConfigRendererList{}) } -// ParameterDrivenConfigRenderSpec defines the desired state of ParameterDrivenConfigRender -type ParameterDrivenConfigRenderSpec struct { +// ParamConfigRendererSpec defines the desired state of ParamConfigRenderer +type ParamConfigRendererSpec struct { // Specifies the ComponentDefinition custom resource (CR) that defines the Component's characteristics and behavior. // // +kubebuilder:validation:Required @@ -113,20 +113,6 @@ type ComponentConfigDescription struct { // +kubebuilder:validation:Required FileFormatConfig *FileFormatConfig `json:"fileFormatConfig"` - // Specifies the containers to inject the ConfigMap parameters as environment variables. - // - // This is useful when application images accept parameters through environment variables and - // generate the final configuration file in the startup script based on these variables. - // - // This field allows users to specify a list of container names, and KubeBlocks will inject the environment - // variables converted from the ConfigMap into these designated containers. This provides a flexible way to - // pass the configuration items from the ConfigMap to the container without modifying the image. - // - // - // +listType=set - // +optional - InjectEnvTo []string `json:"injectEnvTo,omitempty"` - // Specifies whether the configuration needs to be re-rendered after v-scale or h-scale operations to reflect changes. // // In some scenarios, the configuration may need to be updated to reflect the changes in resource allocation @@ -141,8 +127,8 @@ type ComponentConfigDescription struct { ReRenderResourceTypes []RerenderResourceType `json:"reRenderResourceTypes,omitempty"` } -// ParameterDrivenConfigRenderStatus defines the observed state of ParameterDrivenConfigRender -type ParameterDrivenConfigRenderStatus struct { +// ParamConfigRendererStatus defines the observed state of ParamConfigRenderer +type ParamConfigRendererStatus struct { // The most recent generation number of the ParamsDesc object that has been observed by the controller. // // +optional diff --git a/apis/parameters/v1alpha1/zz_generated.deepcopy.go b/apis/parameters/v1alpha1/zz_generated.deepcopy.go index 32201ed0fa1..f8e29fd75f2 100644 --- a/apis/parameters/v1alpha1/zz_generated.deepcopy.go +++ b/apis/parameters/v1alpha1/zz_generated.deepcopy.go @@ -54,11 +54,6 @@ func (in *ComponentConfigDescription) DeepCopyInto(out *ComponentConfigDescripti *out = new(FileFormatConfig) (*in).DeepCopyInto(*out) } - if in.InjectEnvTo != nil { - in, out := &in.InjectEnvTo, &out.InjectEnvTo - *out = make([]string, len(*in)) - copy(*out, *in) - } if in.ReRenderResourceTypes != nil { in, out := &in.ReRenderResourceTypes, &out.ReRenderResourceTypes *out = make([]RerenderResourceType, len(*in)) @@ -433,54 +428,7 @@ func (in *IniConfig) DeepCopy() *IniConfig { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Parameter) DeepCopyInto(out *Parameter) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Parameter. -func (in *Parameter) DeepCopy() *Parameter { - if in == nil { - return nil - } - out := new(Parameter) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Parameter) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ParameterDeletedPolicy) DeepCopyInto(out *ParameterDeletedPolicy) { - *out = *in - if in.DefaultValue != nil { - in, out := &in.DefaultValue, &out.DefaultValue - *out = new(string) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParameterDeletedPolicy. -func (in *ParameterDeletedPolicy) DeepCopy() *ParameterDeletedPolicy { - if in == nil { - return nil - } - out := new(ParameterDeletedPolicy) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ParameterDrivenConfigRender) DeepCopyInto(out *ParameterDrivenConfigRender) { +func (in *ParamConfigRenderer) DeepCopyInto(out *ParamConfigRenderer) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) @@ -488,18 +436,18 @@ func (in *ParameterDrivenConfigRender) DeepCopyInto(out *ParameterDrivenConfigRe out.Status = in.Status } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParameterDrivenConfigRender. -func (in *ParameterDrivenConfigRender) DeepCopy() *ParameterDrivenConfigRender { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParamConfigRenderer. +func (in *ParamConfigRenderer) DeepCopy() *ParamConfigRenderer { if in == nil { return nil } - out := new(ParameterDrivenConfigRender) + out := new(ParamConfigRenderer) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ParameterDrivenConfigRender) DeepCopyObject() runtime.Object { +func (in *ParamConfigRenderer) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -507,31 +455,31 @@ func (in *ParameterDrivenConfigRender) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ParameterDrivenConfigRenderList) DeepCopyInto(out *ParameterDrivenConfigRenderList) { +func (in *ParamConfigRendererList) DeepCopyInto(out *ParamConfigRendererList) { *out = *in out.TypeMeta = in.TypeMeta in.ListMeta.DeepCopyInto(&out.ListMeta) if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]ParameterDrivenConfigRender, len(*in)) + *out = make([]ParamConfigRenderer, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParameterDrivenConfigRenderList. -func (in *ParameterDrivenConfigRenderList) DeepCopy() *ParameterDrivenConfigRenderList { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParamConfigRendererList. +func (in *ParamConfigRendererList) DeepCopy() *ParamConfigRendererList { if in == nil { return nil } - out := new(ParameterDrivenConfigRenderList) + out := new(ParamConfigRendererList) in.DeepCopyInto(out) return out } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ParameterDrivenConfigRenderList) DeepCopyObject() runtime.Object { +func (in *ParamConfigRendererList) DeepCopyObject() runtime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -539,7 +487,7 @@ func (in *ParameterDrivenConfigRenderList) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ParameterDrivenConfigRenderSpec) DeepCopyInto(out *ParameterDrivenConfigRenderSpec) { +func (in *ParamConfigRendererSpec) DeepCopyInto(out *ParamConfigRendererSpec) { *out = *in if in.ParametersDefs != nil { in, out := &in.ParametersDefs, &out.ParametersDefs @@ -555,27 +503,74 @@ func (in *ParameterDrivenConfigRenderSpec) DeepCopyInto(out *ParameterDrivenConf } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParameterDrivenConfigRenderSpec. -func (in *ParameterDrivenConfigRenderSpec) DeepCopy() *ParameterDrivenConfigRenderSpec { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParamConfigRendererSpec. +func (in *ParamConfigRendererSpec) DeepCopy() *ParamConfigRendererSpec { + if in == nil { + return nil + } + out := new(ParamConfigRendererSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ParamConfigRendererStatus) DeepCopyInto(out *ParamConfigRendererStatus) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParamConfigRendererStatus. +func (in *ParamConfigRendererStatus) DeepCopy() *ParamConfigRendererStatus { + if in == nil { + return nil + } + out := new(ParamConfigRendererStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Parameter) DeepCopyInto(out *Parameter) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Parameter. +func (in *Parameter) DeepCopy() *Parameter { if in == nil { return nil } - out := new(ParameterDrivenConfigRenderSpec) + out := new(Parameter) in.DeepCopyInto(out) return out } +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Parameter) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ParameterDrivenConfigRenderStatus) DeepCopyInto(out *ParameterDrivenConfigRenderStatus) { +func (in *ParameterDeletedPolicy) DeepCopyInto(out *ParameterDeletedPolicy) { *out = *in + if in.DefaultValue != nil { + in, out := &in.DefaultValue, &out.DefaultValue + *out = new(string) + **out = **in + } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParameterDrivenConfigRenderStatus. -func (in *ParameterDrivenConfigRenderStatus) DeepCopy() *ParameterDrivenConfigRenderStatus { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParameterDeletedPolicy. +func (in *ParameterDeletedPolicy) DeepCopy() *ParameterDeletedPolicy { if in == nil { return nil } - out := new(ParameterDrivenConfigRenderStatus) + out := new(ParameterDeletedPolicy) in.DeepCopyInto(out) return out } diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 68c69befd10..f262a73565f 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -625,7 +625,7 @@ func main() { Client: mgr.GetClient(), Scheme: mgr.GetScheme(), }).SetupWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create controller", "controller", "ParameterDrivenConfigRender") + setupLog.Error(err, "unable to create controller", "controller", "ParamConfigRenderer") os.Exit(1) } } diff --git a/config/crd/bases/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml b/config/crd/bases/parameters.kubeblocks.io_paramconfigrenderers.yaml similarity index 84% rename from config/crd/bases/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml rename to config/crd/bases/parameters.kubeblocks.io_paramconfigrenderers.yaml index 1452191d848..c07e7e5fce1 100644 --- a/config/crd/bases/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml +++ b/config/crd/bases/parameters.kubeblocks.io_paramconfigrenderers.yaml @@ -5,18 +5,18 @@ metadata: controller-gen.kubebuilder.io/version: v0.14.0 labels: app.kubernetes.io/name: kubeblocks - name: parameterdrivenconfigrenders.parameters.kubeblocks.io + name: paramconfigrenderers.parameters.kubeblocks.io spec: group: parameters.kubeblocks.io names: categories: - kubeblocks - kind: ParameterDrivenConfigRender - listKind: ParameterDrivenConfigRenderList - plural: parameterdrivenconfigrenders + kind: ParamConfigRenderer + listKind: ParamConfigRendererList + plural: paramconfigrenderers shortNames: - paramstemplate - singular: parameterdrivenconfigrender + singular: paramconfigrenderer scope: Cluster versions: - additionalPrinterColumns: @@ -34,7 +34,7 @@ spec: name: v1alpha1 schema: openAPIV3Schema: - description: ParameterDrivenConfigRender is the Schema for the parameterdrivenconfigrenders + description: ParamConfigRenderer is the Schema for the paramconfigrenderers API properties: apiVersion: @@ -55,8 +55,7 @@ spec: metadata: type: object spec: - description: ParameterDrivenConfigRenderSpec defines the desired state - of ParameterDrivenConfigRender + description: ParamConfigRendererSpec defines the desired state of ParamConfigRenderer properties: componentDef: description: Specifies the ComponentDefinition custom resource (CR) @@ -122,22 +121,6 @@ spec: required: - format type: object - injectEnvTo: - description: |- - Specifies the containers to inject the ConfigMap parameters as environment variables. - - - This is useful when application images accept parameters through environment variables and - generate the final configuration file in the startup script based on these variables. - - - This field allows users to specify a list of container names, and KubeBlocks will inject the environment - variables converted from the ConfigMap into these designated containers. This provides a flexible way to - pass the configuration items from the ConfigMap to the container without modifying the image. - items: - type: string - type: array - x-kubernetes-list-type: set name: description: Specifies the config file name in the config template. type: string @@ -191,8 +174,7 @@ spec: - componentDef type: object status: - description: ParameterDrivenConfigRenderStatus defines the observed state - of ParameterDrivenConfigRender + description: ParamConfigRendererStatus defines the observed state of ParamConfigRenderer properties: message: description: Provides additional information about the current phase. diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index eda86d9cc3b..cd874aa5c7a 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -27,9 +27,9 @@ resources: - bases/apps.kubeblocks.io_shardingdefinitions.yaml - bases/apps.kubeblocks.io_sidecardefinitions.yaml - bases/parameters.kubeblocks.io_parametersdefinitions.yaml -- bases/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml - bases/parameters.kubeblocks.io_componentparameters.yaml - bases/parameters.kubeblocks.io_parameters.yaml +- bases/parameters.kubeblocks.io_paramconfigrenderers.yaml #+kubebuilder:scaffold:crdkustomizeresource patchesStrategicMerge: @@ -62,9 +62,9 @@ patchesStrategicMerge: #- patches/webhook_in_shardingdefinitions.yaml #- patches/webhook_in_sidecardefinitions.yaml #- patches/webhook_in_parametersdefinitions.yaml -#- patches/webhook_in_parameterdrivenconfigrenders.yaml #- patches/webhook_in_componentparameters.yaml #- patches/webhook_in_parameters.yaml +#- patches/webhook_in_paramconfigrenderers.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. @@ -96,9 +96,9 @@ patchesStrategicMerge: #- patches/cainjection_in_shardingdefinitions.yaml #- patches/cainjection_in_sidecardefinitions.yaml #- patches/cainjection_in_parametersdefinitions.yaml -#- patches/cainjection_in_parameterdrivenconfigrenders.yaml #- patches/cainjection_in_componentparameters.yaml #- patches/cainjection_in_parameters.yaml +#- patches/cainjection_in_paramconfigrenderers.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch # the following config is for teaching kustomize how to do kustomization for CRDs. diff --git a/config/crd/patches/cainjection_in_parameters_parameterdrivenconfigrenders.yaml b/config/crd/patches/cainjection_in_parameters_paramconfigrenderers.yaml similarity index 80% rename from config/crd/patches/cainjection_in_parameters_parameterdrivenconfigrenders.yaml rename to config/crd/patches/cainjection_in_parameters_paramconfigrenderers.yaml index ed5577d1865..41b69c6954b 100644 --- a/config/crd/patches/cainjection_in_parameters_parameterdrivenconfigrenders.yaml +++ b/config/crd/patches/cainjection_in_parameters_paramconfigrenderers.yaml @@ -4,4 +4,4 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) - name: parameterdrivenconfigrenders.parameters.kubeblocks.io + name: paramconfigrenderers.parameters.kubeblocks.io diff --git a/config/crd/patches/webhook_in_parameters_parameterdrivenconfigrenders.yaml b/config/crd/patches/webhook_in_parameters_paramconfigrenderers.yaml similarity index 85% rename from config/crd/patches/webhook_in_parameters_parameterdrivenconfigrenders.yaml rename to config/crd/patches/webhook_in_parameters_paramconfigrenderers.yaml index dfde75a9f21..4c0d3ae8d58 100644 --- a/config/crd/patches/webhook_in_parameters_parameterdrivenconfigrenders.yaml +++ b/config/crd/patches/webhook_in_parameters_paramconfigrenderers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: parameterdrivenconfigrenders.parameters.kubeblocks.io + name: paramconfigrenderers.parameters.kubeblocks.io spec: conversion: strategy: Webhook diff --git a/config/rbac/parameters_parameterdrivenconfigrender_editor_role.yaml b/config/rbac/parameters_paramconfigrenderer_editor_role.yaml similarity index 65% rename from config/rbac/parameters_parameterdrivenconfigrender_editor_role.yaml rename to config/rbac/parameters_paramconfigrenderer_editor_role.yaml index 0d4fe37fca0..5bf3e086627 100644 --- a/config/rbac/parameters_parameterdrivenconfigrender_editor_role.yaml +++ b/config/rbac/parameters_paramconfigrenderer_editor_role.yaml @@ -1,20 +1,20 @@ -# permissions for end users to edit parameterdrivenconfigrenders. +# permissions for end users to edit paramconfigrenderers. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/name: clusterrole - app.kubernetes.io/instance: parameterdrivenconfigrender-editor-role + app.kubernetes.io/instance: paramconfigrenderer-editor-role app.kubernetes.io/component: rbac app.kubernetes.io/created-by: kubeblocks app.kubernetes.io/part-of: kubeblocks app.kubernetes.io/managed-by: kustomize - name: parameterdrivenconfigrender-editor-role + name: paramconfigrenderer-editor-role rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders + - paramconfigrenderers verbs: - create - delete @@ -26,6 +26,6 @@ rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders/status + - paramconfigrenderers/status verbs: - get diff --git a/config/rbac/parameters_parameterdrivenconfigrender_viewer_role.yaml b/config/rbac/parameters_paramconfigrenderer_viewer_role.yaml similarity index 63% rename from config/rbac/parameters_parameterdrivenconfigrender_viewer_role.yaml rename to config/rbac/parameters_paramconfigrenderer_viewer_role.yaml index da01f937978..c6502df401b 100644 --- a/config/rbac/parameters_parameterdrivenconfigrender_viewer_role.yaml +++ b/config/rbac/parameters_paramconfigrenderer_viewer_role.yaml @@ -1,20 +1,20 @@ -# permissions for end users to view parameterdrivenconfigrenders. +# permissions for end users to view paramconfigrenderers. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/name: clusterrole - app.kubernetes.io/instance: parameterdrivenconfigrender-viewer-role + app.kubernetes.io/instance: paramconfigrenderer-viewer-role app.kubernetes.io/component: rbac app.kubernetes.io/created-by: kubeblocks app.kubernetes.io/part-of: kubeblocks app.kubernetes.io/managed-by: kustomize - name: parameterdrivenconfigrender-viewer-role + name: paramconfigrenderer-viewer-role rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders + - paramconfigrenderers verbs: - get - list @@ -22,6 +22,6 @@ rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders/status + - paramconfigrenderers/status verbs: - get diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index f4a34d2faa6..9ef7735f3b9 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -866,7 +866,7 @@ rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders + - paramconfigrenderers verbs: - create - delete @@ -878,13 +878,13 @@ rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders/finalizers + - paramconfigrenderers/finalizers verbs: - update - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders/status + - paramconfigrenderers/status verbs: - get - patch diff --git a/config/samples/parameters_v1alpha1_parameterdrivenconfigrender.yaml b/config/samples/parameters_v1alpha1_paramconfigrenderer.yaml similarity index 54% rename from config/samples/parameters_v1alpha1_parameterdrivenconfigrender.yaml rename to config/samples/parameters_v1alpha1_paramconfigrenderer.yaml index d5c7482a404..16eb411737a 100644 --- a/config/samples/parameters_v1alpha1_parameterdrivenconfigrender.yaml +++ b/config/samples/parameters_v1alpha1_paramconfigrenderer.yaml @@ -1,12 +1,12 @@ apiVersion: parameters.kubeblocks.io/v1alpha1 -kind: ParameterDrivenConfigRender +kind: ParamConfigRenderer metadata: labels: - app.kubernetes.io/name: parameterdrivenconfigrender - app.kubernetes.io/instance: parameterdrivenconfigrender-sample + app.kubernetes.io/name: paramconfigrenderer + app.kubernetes.io/instance: paramconfigrenderer-sample app.kubernetes.io/part-of: kubeblocks app.kubernetes.io/managed-by: kustomize app.kubernetes.io/created-by: kubeblocks - name: parameterdrivenconfigrender-sample + name: paramconfigrenderer-sample spec: # TODO(user): Add fields here diff --git a/controllers/parameters/config_reconcile_wrapper.go b/controllers/parameters/config_reconcile_wrapper.go index b5f093ea4e4..5a777906102 100644 --- a/controllers/parameters/config_reconcile_wrapper.go +++ b/controllers/parameters/config_reconcile_wrapper.go @@ -47,7 +47,7 @@ type ReconcileContext struct { Containers []string InstanceSetList []workloads.InstanceSet - ConfigRender *parametersv1alpha1.ParameterDrivenConfigRender + ConfigRender *parametersv1alpha1.ParamConfigRenderer ParametersDefs map[string]*parametersv1alpha1.ParametersDefinition } diff --git a/controllers/parameters/configuration_test.go b/controllers/parameters/configuration_test.go index e04792a90c5..9efaace02bc 100644 --- a/controllers/parameters/configuration_test.go +++ b/controllers/parameters/configuration_test.go @@ -190,7 +190,7 @@ func cleanEnv() { // non-namespaced testapps.ClearResources(&testCtx, generics.ConfigConstraintSignature, ml) testapps.ClearResources(&testCtx, generics.ParametersDefinitionSignature, ml) - testapps.ClearResources(&testCtx, generics.ParameterDrivenConfigRenderSignature, ml) + testapps.ClearResources(&testCtx, generics.ParamConfigRendererSignature, ml) // namespaced testapps.ClearResourcesWithRemoveFinalizerOption(&testCtx, generics.ComponentSignature, true, inNS, ml) testapps.ClearResourcesWithRemoveFinalizerOption(&testCtx, generics.ConfigMapSignature, true, inNS) diff --git a/controllers/parameters/parameterdrivenconfigrender_controller.go b/controllers/parameters/paramconfigrenderer_controller.go similarity index 88% rename from controllers/parameters/parameterdrivenconfigrender_controller.go rename to controllers/parameters/paramconfigrenderer_controller.go index 472ebee6eb6..fb8b0dce744 100644 --- a/controllers/parameters/parameterdrivenconfigrender_controller.go +++ b/controllers/parameters/paramconfigrenderer_controller.go @@ -36,16 +36,16 @@ import ( "github.com/apecloud/kubeblocks/pkg/generics" ) -// ParameterDrivenConfigRenderReconciler reconciles a ParameterDrivenConfigRender object +// ParameterDrivenConfigRenderReconciler reconciles a ParamConfigRenderer object type ParameterDrivenConfigRenderReconciler struct { client.Client Scheme *runtime.Scheme Recorder record.EventRecorder } -// +kubebuilder:rbac:groups=parameters.kubeblocks.io,resources=parameterdrivenconfigrenders,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=parameters.kubeblocks.io,resources=parameterdrivenconfigrenders/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=parameters.kubeblocks.io,resources=parameterdrivenconfigrenders/finalizers,verbs=update +// +kubebuilder:rbac:groups=parameters.kubeblocks.io,resources=paramconfigrenderers,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=parameters.kubeblocks.io,resources=paramconfigrenderers/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=parameters.kubeblocks.io,resources=paramconfigrenderers/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. @@ -59,10 +59,10 @@ func (r *ParameterDrivenConfigRenderReconciler) Reconcile(ctx context.Context, r Recorder: r.Recorder, Log: log.FromContext(ctx). WithName("ParameterDrivenConfigRenderReconciler"). - WithValues("ParameterDrivenConfigRender", req.Name), + WithValues("ParamConfigRenderer", req.Name), } - parameterTemplate := ¶metersv1alpha1.ParameterDrivenConfigRender{} + parameterTemplate := ¶metersv1alpha1.ParamConfigRenderer{} if err := r.Client.Get(reqCtx.Ctx, reqCtx.Req.NamespacedName, parameterTemplate); err != nil { return intctrlutil.CheckedRequeueWithError(err, reqCtx.Log, "") } @@ -77,11 +77,11 @@ func (r *ParameterDrivenConfigRenderReconciler) Reconcile(ctx context.Context, r // SetupWithManager sets up the controller with the Manager. func (r *ParameterDrivenConfigRenderReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). - For(¶metersv1alpha1.ParameterDrivenConfigRender{}). + For(¶metersv1alpha1.ParamConfigRenderer{}). Complete(r) } -func (r *ParameterDrivenConfigRenderReconciler) reconcile(reqCtx intctrlutil.RequestCtx, parameterTemplate *parametersv1alpha1.ParameterDrivenConfigRender) (ctrl.Result, error) { +func (r *ParameterDrivenConfigRenderReconciler) reconcile(reqCtx intctrlutil.RequestCtx, parameterTemplate *parametersv1alpha1.ParamConfigRenderer) (ctrl.Result, error) { if intctrlutil.ParametersDrivenConfigRenderTerminalPhases(parameterTemplate.Status, parameterTemplate.Generation) { return intctrlutil.Reconciled() } @@ -101,7 +101,7 @@ func (r *ParameterDrivenConfigRenderReconciler) reconcile(reqCtx intctrlutil.Req return intctrlutil.Reconciled() } -func (r *ParameterDrivenConfigRenderReconciler) validate(ctx intctrlutil.RequestCtx, cli client.Client, parameterTemplate *parametersv1alpha1.ParameterDrivenConfigRenderSpec) error { +func (r *ParameterDrivenConfigRenderReconciler) validate(ctx intctrlutil.RequestCtx, cli client.Client, parameterTemplate *parametersv1alpha1.ParamConfigRendererSpec) error { cmpd := &appsv1.ComponentDefinition{} if err := cli.Get(ctx.Ctx, client.ObjectKey{Name: parameterTemplate.ComponentDef}, cmpd); err != nil { return err @@ -141,15 +141,15 @@ func validateParametersDefs(reqCtx intctrlutil.RequestCtx, cli client.Client, pa return nil } -func (r *ParameterDrivenConfigRenderReconciler) available(ctx context.Context, cli client.Client, parameterTemplate *parametersv1alpha1.ParameterDrivenConfigRender) error { +func (r *ParameterDrivenConfigRenderReconciler) available(ctx context.Context, cli client.Client, parameterTemplate *parametersv1alpha1.ParamConfigRenderer) error { return r.status(ctx, cli, parameterTemplate, parametersv1alpha1.PDAvailablePhase, nil) } -func (r *ParameterDrivenConfigRenderReconciler) unavailable(ctx context.Context, cli client.Client, parameterTemplate *parametersv1alpha1.ParameterDrivenConfigRender, err error) error { +func (r *ParameterDrivenConfigRenderReconciler) unavailable(ctx context.Context, cli client.Client, parameterTemplate *parametersv1alpha1.ParamConfigRenderer, err error) error { return r.status(ctx, cli, parameterTemplate, parametersv1alpha1.PDUnavailablePhase, err) } -func (r *ParameterDrivenConfigRenderReconciler) status(ctx context.Context, cli client.Client, parameterRender *parametersv1alpha1.ParameterDrivenConfigRender, phase parametersv1alpha1.ParametersDescPhase, err error) error { +func (r *ParameterDrivenConfigRenderReconciler) status(ctx context.Context, cli client.Client, parameterRender *parametersv1alpha1.ParamConfigRenderer, phase parametersv1alpha1.ParametersDescPhase, err error) error { patch := client.MergeFrom(parameterRender.DeepCopy()) parameterRender.Status.ObservedGeneration = parameterRender.Generation parameterRender.Status.Phase = phase diff --git a/controllers/parameters/parameterdrivenconfigrender_controller_test.go b/controllers/parameters/paramconfigrenderer_controller_test.go similarity index 84% rename from controllers/parameters/parameterdrivenconfigrender_controller_test.go rename to controllers/parameters/paramconfigrenderer_controller_test.go index 9b2d68af0d1..97b2016f712 100644 --- a/controllers/parameters/parameterdrivenconfigrender_controller_test.go +++ b/controllers/parameters/paramconfigrenderer_controller_test.go @@ -28,7 +28,7 @@ import ( testparameters "github.com/apecloud/kubeblocks/pkg/testutil/parameters" ) -var _ = Describe("ParameterDrivenConfigRender Controller", func() { +var _ = Describe("ParamConfigRenderer Controller", func() { BeforeEach(cleanEnv) @@ -65,14 +65,14 @@ var _ = Describe("ParameterDrivenConfigRender Controller", func() { It("normal test", func() { initPDCRTest() - pdcr := testparameters.NewParametersDrivenConfigFactory(pdcrName). + pdcr := testparameters.NewParamConfigRendererFactory(pdcrName). SetParametersDefs(paramsDefName). SetComponentDefinition(compDefName). SetTemplateName(configSpecName). Create(&testCtx). GetObject() - Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParameterDrivenConfigRender) { + Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParamConfigRenderer) { g.Expect(pdcr.Status.Phase).Should(BeEquivalentTo(parametersv1alpha1.PDAvailablePhase)) })).Should(Succeed()) @@ -81,7 +81,7 @@ var _ = Describe("ParameterDrivenConfigRender Controller", func() { It("invalid config template", func() { initPDCRTest() - pdcr := testparameters.NewParametersDrivenConfigFactory(pdcrName). + pdcr := testparameters.NewParamConfigRendererFactory(pdcrName). SetParametersDefs(paramsDefName). SetComponentDefinition(compDefName). SetTemplateName(configSpecName). @@ -89,7 +89,7 @@ var _ = Describe("ParameterDrivenConfigRender Controller", func() { Create(&testCtx). GetObject() - Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParameterDrivenConfigRender) { + Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParamConfigRenderer) { g.Expect(pdcr.Status.Phase).Should(BeEquivalentTo(parametersv1alpha1.PDAvailablePhase)) })).ShouldNot(Succeed()) }) @@ -97,13 +97,13 @@ var _ = Describe("ParameterDrivenConfigRender Controller", func() { It("invalid parametersdefinitions", func() { initPDCRTest() - pdcr := testparameters.NewParametersDrivenConfigFactory(pdcrName). + pdcr := testparameters.NewParamConfigRendererFactory(pdcrName). SetParametersDefs("not_exist_pd"). SetComponentDefinition(compDefName). Create(&testCtx). GetObject() - Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParameterDrivenConfigRender) { + Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParamConfigRenderer) { g.Expect(pdcr.Status.Phase).Should(BeEquivalentTo(parametersv1alpha1.PDAvailablePhase)) })).ShouldNot(Succeed()) }) @@ -111,13 +111,13 @@ var _ = Describe("ParameterDrivenConfigRender Controller", func() { It("invalid cmpd", func() { initPDCRTest() - pdcr := testparameters.NewParametersDrivenConfigFactory(pdcrName). + pdcr := testparameters.NewParamConfigRendererFactory(pdcrName). SetParametersDefs(paramsDefName). SetComponentDefinition("not_exist_cmpd"). Create(&testCtx). GetObject() - Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParameterDrivenConfigRender) { + Eventually(testapps.CheckObj(&testCtx, client.ObjectKeyFromObject(pdcr), func(g Gomega, pdcr *parametersv1alpha1.ParamConfigRenderer) { g.Expect(pdcr.Status.Phase).Should(BeEquivalentTo(parametersv1alpha1.PDAvailablePhase)) })).ShouldNot(Succeed()) }) diff --git a/controllers/parameters/parametersdefinition_controller.go b/controllers/parameters/parametersdefinition_controller.go index 611e5d516ce..e692531a18c 100644 --- a/controllers/parameters/parametersdefinition_controller.go +++ b/controllers/parameters/parametersdefinition_controller.go @@ -122,7 +122,7 @@ func (r *ParametersDefinitionReconciler) deletionHandler(parametersDef *paramete } if res, err := intctrlutil.ValidateReferenceCR(reqCtx, r.Client, parametersDef, cfgcore.GenerateConstraintsUniqLabelKeyWithConfig(parametersDef.GetName()), - recordEvent, ¶metersv1alpha1.ParameterDrivenConfigRenderList{}); res != nil || err != nil { + recordEvent, ¶metersv1alpha1.ParamConfigRendererList{}); res != nil || err != nil { return res, err } return nil, nil diff --git a/deploy/helm/config/rbac/role.yaml b/deploy/helm/config/rbac/role.yaml index f4a34d2faa6..9ef7735f3b9 100644 --- a/deploy/helm/config/rbac/role.yaml +++ b/deploy/helm/config/rbac/role.yaml @@ -866,7 +866,7 @@ rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders + - paramconfigrenderers verbs: - create - delete @@ -878,13 +878,13 @@ rules: - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders/finalizers + - paramconfigrenderers/finalizers verbs: - update - apiGroups: - parameters.kubeblocks.io resources: - - parameterdrivenconfigrenders/status + - paramconfigrenderers/status verbs: - get - patch diff --git a/deploy/helm/crds/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml b/deploy/helm/crds/parameters.kubeblocks.io_paramconfigrenderers.yaml similarity index 84% rename from deploy/helm/crds/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml rename to deploy/helm/crds/parameters.kubeblocks.io_paramconfigrenderers.yaml index 1452191d848..c07e7e5fce1 100644 --- a/deploy/helm/crds/parameters.kubeblocks.io_parameterdrivenconfigrenders.yaml +++ b/deploy/helm/crds/parameters.kubeblocks.io_paramconfigrenderers.yaml @@ -5,18 +5,18 @@ metadata: controller-gen.kubebuilder.io/version: v0.14.0 labels: app.kubernetes.io/name: kubeblocks - name: parameterdrivenconfigrenders.parameters.kubeblocks.io + name: paramconfigrenderers.parameters.kubeblocks.io spec: group: parameters.kubeblocks.io names: categories: - kubeblocks - kind: ParameterDrivenConfigRender - listKind: ParameterDrivenConfigRenderList - plural: parameterdrivenconfigrenders + kind: ParamConfigRenderer + listKind: ParamConfigRendererList + plural: paramconfigrenderers shortNames: - paramstemplate - singular: parameterdrivenconfigrender + singular: paramconfigrenderer scope: Cluster versions: - additionalPrinterColumns: @@ -34,7 +34,7 @@ spec: name: v1alpha1 schema: openAPIV3Schema: - description: ParameterDrivenConfigRender is the Schema for the parameterdrivenconfigrenders + description: ParamConfigRenderer is the Schema for the paramconfigrenderers API properties: apiVersion: @@ -55,8 +55,7 @@ spec: metadata: type: object spec: - description: ParameterDrivenConfigRenderSpec defines the desired state - of ParameterDrivenConfigRender + description: ParamConfigRendererSpec defines the desired state of ParamConfigRenderer properties: componentDef: description: Specifies the ComponentDefinition custom resource (CR) @@ -122,22 +121,6 @@ spec: required: - format type: object - injectEnvTo: - description: |- - Specifies the containers to inject the ConfigMap parameters as environment variables. - - - This is useful when application images accept parameters through environment variables and - generate the final configuration file in the startup script based on these variables. - - - This field allows users to specify a list of container names, and KubeBlocks will inject the environment - variables converted from the ConfigMap into these designated containers. This provides a flexible way to - pass the configuration items from the ConfigMap to the container without modifying the image. - items: - type: string - type: array - x-kubernetes-list-type: set name: description: Specifies the config file name in the config template. type: string @@ -191,8 +174,7 @@ spec: - componentDef type: object status: - description: ParameterDrivenConfigRenderStatus defines the observed state - of ParameterDrivenConfigRender + description: ParamConfigRendererStatus defines the observed state of ParamConfigRenderer properties: message: description: Provides additional information about the current phase. diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_paramconfigrenderer.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_paramconfigrenderer.go new file mode 100644 index 00000000000..b7f0c4ea187 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_paramconfigrenderer.go @@ -0,0 +1,132 @@ +/* +Copyright (C) 2022-2024 ApeCloud Co., Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + "context" + + v1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + labels "k8s.io/apimachinery/pkg/labels" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" +) + +// FakeParamConfigRenderers implements ParamConfigRendererInterface +type FakeParamConfigRenderers struct { + Fake *FakeParametersV1alpha1 +} + +var paramconfigrenderersResource = v1alpha1.SchemeGroupVersion.WithResource("paramconfigrenderers") + +var paramconfigrenderersKind = v1alpha1.SchemeGroupVersion.WithKind("ParamConfigRenderer") + +// Get takes name of the paramConfigRenderer, and returns the corresponding paramConfigRenderer object, and an error if there is any. +func (c *FakeParamConfigRenderers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootGetAction(paramconfigrenderersResource, name), &v1alpha1.ParamConfigRenderer{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.ParamConfigRenderer), err +} + +// List takes label and field selectors, and returns the list of ParamConfigRenderers that match those selectors. +func (c *FakeParamConfigRenderers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ParamConfigRendererList, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootListAction(paramconfigrenderersResource, paramconfigrenderersKind, opts), &v1alpha1.ParamConfigRendererList{}) + if obj == nil { + return nil, err + } + + label, _, _ := testing.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &v1alpha1.ParamConfigRendererList{ListMeta: obj.(*v1alpha1.ParamConfigRendererList).ListMeta} + for _, item := range obj.(*v1alpha1.ParamConfigRendererList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested paramConfigRenderers. +func (c *FakeParamConfigRenderers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(testing.NewRootWatchAction(paramconfigrenderersResource, opts)) +} + +// Create takes the representation of a paramConfigRenderer and creates it. Returns the server's representation of the paramConfigRenderer, and an error, if there is any. +func (c *FakeParamConfigRenderers) Create(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.CreateOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootCreateAction(paramconfigrenderersResource, paramConfigRenderer), &v1alpha1.ParamConfigRenderer{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.ParamConfigRenderer), err +} + +// Update takes the representation of a paramConfigRenderer and updates it. Returns the server's representation of the paramConfigRenderer, and an error, if there is any. +func (c *FakeParamConfigRenderers) Update(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.UpdateOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateAction(paramconfigrenderersResource, paramConfigRenderer), &v1alpha1.ParamConfigRenderer{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.ParamConfigRenderer), err +} + +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). +func (c *FakeParamConfigRenderers) UpdateStatus(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.UpdateOptions) (*v1alpha1.ParamConfigRenderer, error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateSubresourceAction(paramconfigrenderersResource, "status", paramConfigRenderer), &v1alpha1.ParamConfigRenderer{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.ParamConfigRenderer), err +} + +// Delete takes name of the paramConfigRenderer and deletes it. Returns an error if one occurs. +func (c *FakeParamConfigRenderers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(testing.NewRootDeleteActionWithOptions(paramconfigrenderersResource, name, opts), &v1alpha1.ParamConfigRenderer{}) + return err +} + +// DeleteCollection deletes a collection of objects. +func (c *FakeParamConfigRenderers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { + action := testing.NewRootDeleteCollectionAction(paramconfigrenderersResource, listOpts) + + _, err := c.Fake.Invokes(action, &v1alpha1.ParamConfigRendererList{}) + return err +} + +// Patch applies the patch and returns the patched paramConfigRenderer. +func (c *FakeParamConfigRenderers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ParamConfigRenderer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootPatchSubresourceAction(paramconfigrenderersResource, name, pt, data, subresources...), &v1alpha1.ParamConfigRenderer{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.ParamConfigRenderer), err +} diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameterdrivenconfigrender.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameterdrivenconfigrender.go deleted file mode 100644 index 538fcea90b3..00000000000 --- a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameterdrivenconfigrender.go +++ /dev/null @@ -1,132 +0,0 @@ -/* -Copyright (C) 2022-2024 ApeCloud Co., Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - "context" - - v1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" -) - -// FakeParameterDrivenConfigRenders implements ParameterDrivenConfigRenderInterface -type FakeParameterDrivenConfigRenders struct { - Fake *FakeParametersV1alpha1 -} - -var parameterdrivenconfigrendersResource = v1alpha1.SchemeGroupVersion.WithResource("parameterdrivenconfigrenders") - -var parameterdrivenconfigrendersKind = v1alpha1.SchemeGroupVersion.WithKind("ParameterDrivenConfigRender") - -// Get takes name of the parameterDrivenConfigRender, and returns the corresponding parameterDrivenConfigRender object, and an error if there is any. -func (c *FakeParameterDrivenConfigRenders) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootGetAction(parameterdrivenconfigrendersResource, name), &v1alpha1.ParameterDrivenConfigRender{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ParameterDrivenConfigRender), err -} - -// List takes label and field selectors, and returns the list of ParameterDrivenConfigRenders that match those selectors. -func (c *FakeParameterDrivenConfigRenders) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ParameterDrivenConfigRenderList, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootListAction(parameterdrivenconfigrendersResource, parameterdrivenconfigrendersKind, opts), &v1alpha1.ParameterDrivenConfigRenderList{}) - if obj == nil { - return nil, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.ParameterDrivenConfigRenderList{ListMeta: obj.(*v1alpha1.ParameterDrivenConfigRenderList).ListMeta} - for _, item := range obj.(*v1alpha1.ParameterDrivenConfigRenderList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested parameterDrivenConfigRenders. -func (c *FakeParameterDrivenConfigRenders) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchAction(parameterdrivenconfigrendersResource, opts)) -} - -// Create takes the representation of a parameterDrivenConfigRender and creates it. Returns the server's representation of the parameterDrivenConfigRender, and an error, if there is any. -func (c *FakeParameterDrivenConfigRenders) Create(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.CreateOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootCreateAction(parameterdrivenconfigrendersResource, parameterDrivenConfigRender), &v1alpha1.ParameterDrivenConfigRender{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ParameterDrivenConfigRender), err -} - -// Update takes the representation of a parameterDrivenConfigRender and updates it. Returns the server's representation of the parameterDrivenConfigRender, and an error, if there is any. -func (c *FakeParameterDrivenConfigRenders) Update(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.UpdateOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateAction(parameterdrivenconfigrendersResource, parameterDrivenConfigRender), &v1alpha1.ParameterDrivenConfigRender{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ParameterDrivenConfigRender), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeParameterDrivenConfigRenders) UpdateStatus(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.UpdateOptions) (*v1alpha1.ParameterDrivenConfigRender, error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceAction(parameterdrivenconfigrendersResource, "status", parameterDrivenConfigRender), &v1alpha1.ParameterDrivenConfigRender{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ParameterDrivenConfigRender), err -} - -// Delete takes name of the parameterDrivenConfigRender and deletes it. Returns an error if one occurs. -func (c *FakeParameterDrivenConfigRenders) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(parameterdrivenconfigrendersResource, name, opts), &v1alpha1.ParameterDrivenConfigRender{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeParameterDrivenConfigRenders) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionAction(parameterdrivenconfigrendersResource, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.ParameterDrivenConfigRenderList{}) - return err -} - -// Patch applies the patch and returns the patched parameterDrivenConfigRender. -func (c *FakeParameterDrivenConfigRenders) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceAction(parameterdrivenconfigrendersResource, name, pt, data, subresources...), &v1alpha1.ParameterDrivenConfigRender{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.ParameterDrivenConfigRender), err -} diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameters_client.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameters_client.go index 6dd08cf2bd1..32305b139bb 100644 --- a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameters_client.go +++ b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/fake/fake_parameters_client.go @@ -32,12 +32,12 @@ func (c *FakeParametersV1alpha1) ComponentParameters(namespace string) v1alpha1. return &FakeComponentParameters{c, namespace} } -func (c *FakeParametersV1alpha1) Parameters(namespace string) v1alpha1.ParameterInterface { - return &FakeParameters{c, namespace} +func (c *FakeParametersV1alpha1) ParamConfigRenderers() v1alpha1.ParamConfigRendererInterface { + return &FakeParamConfigRenderers{c} } -func (c *FakeParametersV1alpha1) ParameterDrivenConfigRenders() v1alpha1.ParameterDrivenConfigRenderInterface { - return &FakeParameterDrivenConfigRenders{c} +func (c *FakeParametersV1alpha1) Parameters(namespace string) v1alpha1.ParameterInterface { + return &FakeParameters{c, namespace} } func (c *FakeParametersV1alpha1) ParametersDefinitions() v1alpha1.ParametersDefinitionInterface { diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/generated_expansion.go index dc02e5f7120..3f5ec10378e 100644 --- a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/generated_expansion.go +++ b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/generated_expansion.go @@ -20,8 +20,8 @@ package v1alpha1 type ComponentParameterExpansion interface{} -type ParameterExpansion interface{} +type ParamConfigRendererExpansion interface{} -type ParameterDrivenConfigRenderExpansion interface{} +type ParameterExpansion interface{} type ParametersDefinitionExpansion interface{} diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/paramconfigrenderer.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/paramconfigrenderer.go new file mode 100644 index 00000000000..d49a272dd85 --- /dev/null +++ b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/paramconfigrenderer.go @@ -0,0 +1,184 @@ +/* +Copyright (C) 2022-2024 ApeCloud Co., Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + "context" + "time" + + v1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1" + scheme "github.com/apecloud/kubeblocks/pkg/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" +) + +// ParamConfigRenderersGetter has a method to return a ParamConfigRendererInterface. +// A group's client should implement this interface. +type ParamConfigRenderersGetter interface { + ParamConfigRenderers() ParamConfigRendererInterface +} + +// ParamConfigRendererInterface has methods to work with ParamConfigRenderer resources. +type ParamConfigRendererInterface interface { + Create(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.CreateOptions) (*v1alpha1.ParamConfigRenderer, error) + Update(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.UpdateOptions) (*v1alpha1.ParamConfigRenderer, error) + UpdateStatus(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.UpdateOptions) (*v1alpha1.ParamConfigRenderer, error) + Delete(ctx context.Context, name string, opts v1.DeleteOptions) error + DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error + Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.ParamConfigRenderer, error) + List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.ParamConfigRendererList, error) + Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ParamConfigRenderer, err error) + ParamConfigRendererExpansion +} + +// paramConfigRenderers implements ParamConfigRendererInterface +type paramConfigRenderers struct { + client rest.Interface +} + +// newParamConfigRenderers returns a ParamConfigRenderers +func newParamConfigRenderers(c *ParametersV1alpha1Client) *paramConfigRenderers { + return ¶mConfigRenderers{ + client: c.RESTClient(), + } +} + +// Get takes name of the paramConfigRenderer, and returns the corresponding paramConfigRenderer object, and an error if there is any. +func (c *paramConfigRenderers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + result = &v1alpha1.ParamConfigRenderer{} + err = c.client.Get(). + Resource("paramconfigrenderers"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(ctx). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of ParamConfigRenderers that match those selectors. +func (c *paramConfigRenderers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ParamConfigRendererList, err error) { + var timeout time.Duration + if opts.TimeoutSeconds != nil { + timeout = time.Duration(*opts.TimeoutSeconds) * time.Second + } + result = &v1alpha1.ParamConfigRendererList{} + err = c.client.Get(). + Resource("paramconfigrenderers"). + VersionedParams(&opts, scheme.ParameterCodec). + Timeout(timeout). + Do(ctx). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested paramConfigRenderers. +func (c *paramConfigRenderers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { + var timeout time.Duration + if opts.TimeoutSeconds != nil { + timeout = time.Duration(*opts.TimeoutSeconds) * time.Second + } + opts.Watch = true + return c.client.Get(). + Resource("paramconfigrenderers"). + VersionedParams(&opts, scheme.ParameterCodec). + Timeout(timeout). + Watch(ctx) +} + +// Create takes the representation of a paramConfigRenderer and creates it. Returns the server's representation of the paramConfigRenderer, and an error, if there is any. +func (c *paramConfigRenderers) Create(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.CreateOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + result = &v1alpha1.ParamConfigRenderer{} + err = c.client.Post(). + Resource("paramconfigrenderers"). + VersionedParams(&opts, scheme.ParameterCodec). + Body(paramConfigRenderer). + Do(ctx). + Into(result) + return +} + +// Update takes the representation of a paramConfigRenderer and updates it. Returns the server's representation of the paramConfigRenderer, and an error, if there is any. +func (c *paramConfigRenderers) Update(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.UpdateOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + result = &v1alpha1.ParamConfigRenderer{} + err = c.client.Put(). + Resource("paramconfigrenderers"). + Name(paramConfigRenderer.Name). + VersionedParams(&opts, scheme.ParameterCodec). + Body(paramConfigRenderer). + Do(ctx). + Into(result) + return +} + +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). +func (c *paramConfigRenderers) UpdateStatus(ctx context.Context, paramConfigRenderer *v1alpha1.ParamConfigRenderer, opts v1.UpdateOptions) (result *v1alpha1.ParamConfigRenderer, err error) { + result = &v1alpha1.ParamConfigRenderer{} + err = c.client.Put(). + Resource("paramconfigrenderers"). + Name(paramConfigRenderer.Name). + SubResource("status"). + VersionedParams(&opts, scheme.ParameterCodec). + Body(paramConfigRenderer). + Do(ctx). + Into(result) + return +} + +// Delete takes name of the paramConfigRenderer and deletes it. Returns an error if one occurs. +func (c *paramConfigRenderers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { + return c.client.Delete(). + Resource("paramconfigrenderers"). + Name(name). + Body(&opts). + Do(ctx). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *paramConfigRenderers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { + var timeout time.Duration + if listOpts.TimeoutSeconds != nil { + timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second + } + return c.client.Delete(). + Resource("paramconfigrenderers"). + VersionedParams(&listOpts, scheme.ParameterCodec). + Timeout(timeout). + Body(&opts). + Do(ctx). + Error() +} + +// Patch applies the patch and returns the patched paramConfigRenderer. +func (c *paramConfigRenderers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ParamConfigRenderer, err error) { + result = &v1alpha1.ParamConfigRenderer{} + err = c.client.Patch(pt). + Resource("paramconfigrenderers"). + Name(name). + SubResource(subresources...). + VersionedParams(&opts, scheme.ParameterCodec). + Body(data). + Do(ctx). + Into(result) + return +} diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameterdrivenconfigrender.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameterdrivenconfigrender.go deleted file mode 100644 index cc0df7de086..00000000000 --- a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameterdrivenconfigrender.go +++ /dev/null @@ -1,184 +0,0 @@ -/* -Copyright (C) 2022-2024 ApeCloud Co., Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - "time" - - v1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1" - scheme "github.com/apecloud/kubeblocks/pkg/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" -) - -// ParameterDrivenConfigRendersGetter has a method to return a ParameterDrivenConfigRenderInterface. -// A group's client should implement this interface. -type ParameterDrivenConfigRendersGetter interface { - ParameterDrivenConfigRenders() ParameterDrivenConfigRenderInterface -} - -// ParameterDrivenConfigRenderInterface has methods to work with ParameterDrivenConfigRender resources. -type ParameterDrivenConfigRenderInterface interface { - Create(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.CreateOptions) (*v1alpha1.ParameterDrivenConfigRender, error) - Update(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.UpdateOptions) (*v1alpha1.ParameterDrivenConfigRender, error) - UpdateStatus(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.UpdateOptions) (*v1alpha1.ParameterDrivenConfigRender, error) - Delete(ctx context.Context, name string, opts v1.DeleteOptions) error - DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.ParameterDrivenConfigRender, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.ParameterDrivenConfigRenderList, error) - Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ParameterDrivenConfigRender, err error) - ParameterDrivenConfigRenderExpansion -} - -// parameterDrivenConfigRenders implements ParameterDrivenConfigRenderInterface -type parameterDrivenConfigRenders struct { - client rest.Interface -} - -// newParameterDrivenConfigRenders returns a ParameterDrivenConfigRenders -func newParameterDrivenConfigRenders(c *ParametersV1alpha1Client) *parameterDrivenConfigRenders { - return ¶meterDrivenConfigRenders{ - client: c.RESTClient(), - } -} - -// Get takes name of the parameterDrivenConfigRender, and returns the corresponding parameterDrivenConfigRender object, and an error if there is any. -func (c *parameterDrivenConfigRenders) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - result = &v1alpha1.ParameterDrivenConfigRender{} - err = c.client.Get(). - Resource("parameterdrivenconfigrenders"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(ctx). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of ParameterDrivenConfigRenders that match those selectors. -func (c *parameterDrivenConfigRenders) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ParameterDrivenConfigRenderList, err error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - result = &v1alpha1.ParameterDrivenConfigRenderList{} - err = c.client.Get(). - Resource("parameterdrivenconfigrenders"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Do(ctx). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested parameterDrivenConfigRenders. -func (c *parameterDrivenConfigRenders) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - opts.Watch = true - return c.client.Get(). - Resource("parameterdrivenconfigrenders"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Watch(ctx) -} - -// Create takes the representation of a parameterDrivenConfigRender and creates it. Returns the server's representation of the parameterDrivenConfigRender, and an error, if there is any. -func (c *parameterDrivenConfigRenders) Create(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.CreateOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - result = &v1alpha1.ParameterDrivenConfigRender{} - err = c.client.Post(). - Resource("parameterdrivenconfigrenders"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(parameterDrivenConfigRender). - Do(ctx). - Into(result) - return -} - -// Update takes the representation of a parameterDrivenConfigRender and updates it. Returns the server's representation of the parameterDrivenConfigRender, and an error, if there is any. -func (c *parameterDrivenConfigRenders) Update(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.UpdateOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - result = &v1alpha1.ParameterDrivenConfigRender{} - err = c.client.Put(). - Resource("parameterdrivenconfigrenders"). - Name(parameterDrivenConfigRender.Name). - VersionedParams(&opts, scheme.ParameterCodec). - Body(parameterDrivenConfigRender). - Do(ctx). - Into(result) - return -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *parameterDrivenConfigRenders) UpdateStatus(ctx context.Context, parameterDrivenConfigRender *v1alpha1.ParameterDrivenConfigRender, opts v1.UpdateOptions) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - result = &v1alpha1.ParameterDrivenConfigRender{} - err = c.client.Put(). - Resource("parameterdrivenconfigrenders"). - Name(parameterDrivenConfigRender.Name). - SubResource("status"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(parameterDrivenConfigRender). - Do(ctx). - Into(result) - return -} - -// Delete takes name of the parameterDrivenConfigRender and deletes it. Returns an error if one occurs. -func (c *parameterDrivenConfigRenders) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - return c.client.Delete(). - Resource("parameterdrivenconfigrenders"). - Name(name). - Body(&opts). - Do(ctx). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *parameterDrivenConfigRenders) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - var timeout time.Duration - if listOpts.TimeoutSeconds != nil { - timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second - } - return c.client.Delete(). - Resource("parameterdrivenconfigrenders"). - VersionedParams(&listOpts, scheme.ParameterCodec). - Timeout(timeout). - Body(&opts). - Do(ctx). - Error() -} - -// Patch applies the patch and returns the patched parameterDrivenConfigRender. -func (c *parameterDrivenConfigRenders) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.ParameterDrivenConfigRender, err error) { - result = &v1alpha1.ParameterDrivenConfigRender{} - err = c.client.Patch(pt). - Resource("parameterdrivenconfigrenders"). - Name(name). - SubResource(subresources...). - VersionedParams(&opts, scheme.ParameterCodec). - Body(data). - Do(ctx). - Into(result) - return -} diff --git a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameters_client.go b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameters_client.go index 6d7e0b74710..883e3ee501a 100644 --- a/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameters_client.go +++ b/pkg/client/clientset/versioned/typed/parameters/v1alpha1/parameters_client.go @@ -29,8 +29,8 @@ import ( type ParametersV1alpha1Interface interface { RESTClient() rest.Interface ComponentParametersGetter + ParamConfigRenderersGetter ParametersGetter - ParameterDrivenConfigRendersGetter ParametersDefinitionsGetter } @@ -43,12 +43,12 @@ func (c *ParametersV1alpha1Client) ComponentParameters(namespace string) Compone return newComponentParameters(c, namespace) } -func (c *ParametersV1alpha1Client) Parameters(namespace string) ParameterInterface { - return newParameters(c, namespace) +func (c *ParametersV1alpha1Client) ParamConfigRenderers() ParamConfigRendererInterface { + return newParamConfigRenderers(c) } -func (c *ParametersV1alpha1Client) ParameterDrivenConfigRenders() ParameterDrivenConfigRenderInterface { - return newParameterDrivenConfigRenders(c) +func (c *ParametersV1alpha1Client) Parameters(namespace string) ParameterInterface { + return newParameters(c, namespace) } func (c *ParametersV1alpha1Client) ParametersDefinitions() ParametersDefinitionInterface { diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index cb22c116d94..2bae11d26c5 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -129,10 +129,10 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource // Group=parameters.kubeblocks.io, Version=v1alpha1 case parametersv1alpha1.SchemeGroupVersion.WithResource("componentparameters"): return &genericInformer{resource: resource.GroupResource(), informer: f.Parameters().V1alpha1().ComponentParameters().Informer()}, nil + case parametersv1alpha1.SchemeGroupVersion.WithResource("paramconfigrenderers"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Parameters().V1alpha1().ParamConfigRenderers().Informer()}, nil case parametersv1alpha1.SchemeGroupVersion.WithResource("parameters"): return &genericInformer{resource: resource.GroupResource(), informer: f.Parameters().V1alpha1().Parameters().Informer()}, nil - case parametersv1alpha1.SchemeGroupVersion.WithResource("parameterdrivenconfigrenders"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Parameters().V1alpha1().ParameterDrivenConfigRenders().Informer()}, nil case parametersv1alpha1.SchemeGroupVersion.WithResource("parametersdefinitions"): return &genericInformer{resource: resource.GroupResource(), informer: f.Parameters().V1alpha1().ParametersDefinitions().Informer()}, nil diff --git a/pkg/client/informers/externalversions/parameters/v1alpha1/interface.go b/pkg/client/informers/externalversions/parameters/v1alpha1/interface.go index 9674c7684e3..884a0107dc4 100644 --- a/pkg/client/informers/externalversions/parameters/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/parameters/v1alpha1/interface.go @@ -26,10 +26,10 @@ import ( type Interface interface { // ComponentParameters returns a ComponentParameterInformer. ComponentParameters() ComponentParameterInformer + // ParamConfigRenderers returns a ParamConfigRendererInformer. + ParamConfigRenderers() ParamConfigRendererInformer // Parameters returns a ParameterInformer. Parameters() ParameterInformer - // ParameterDrivenConfigRenders returns a ParameterDrivenConfigRenderInformer. - ParameterDrivenConfigRenders() ParameterDrivenConfigRenderInformer // ParametersDefinitions returns a ParametersDefinitionInformer. ParametersDefinitions() ParametersDefinitionInformer } @@ -50,16 +50,16 @@ func (v *version) ComponentParameters() ComponentParameterInformer { return &componentParameterInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } +// ParamConfigRenderers returns a ParamConfigRendererInformer. +func (v *version) ParamConfigRenderers() ParamConfigRendererInformer { + return ¶mConfigRendererInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} +} + // Parameters returns a ParameterInformer. func (v *version) Parameters() ParameterInformer { return ¶meterInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } -// ParameterDrivenConfigRenders returns a ParameterDrivenConfigRenderInformer. -func (v *version) ParameterDrivenConfigRenders() ParameterDrivenConfigRenderInformer { - return ¶meterDrivenConfigRenderInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} -} - // ParametersDefinitions returns a ParametersDefinitionInformer. func (v *version) ParametersDefinitions() ParametersDefinitionInformer { return ¶metersDefinitionInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} diff --git a/pkg/client/informers/externalversions/parameters/v1alpha1/parameterdrivenconfigrender.go b/pkg/client/informers/externalversions/parameters/v1alpha1/paramconfigrenderer.go similarity index 52% rename from pkg/client/informers/externalversions/parameters/v1alpha1/parameterdrivenconfigrender.go rename to pkg/client/informers/externalversions/parameters/v1alpha1/paramconfigrenderer.go index 8e6cb360781..3692f5e3cef 100644 --- a/pkg/client/informers/externalversions/parameters/v1alpha1/parameterdrivenconfigrender.go +++ b/pkg/client/informers/externalversions/parameters/v1alpha1/paramconfigrenderer.go @@ -32,58 +32,58 @@ import ( cache "k8s.io/client-go/tools/cache" ) -// ParameterDrivenConfigRenderInformer provides access to a shared informer and lister for -// ParameterDrivenConfigRenders. -type ParameterDrivenConfigRenderInformer interface { +// ParamConfigRendererInformer provides access to a shared informer and lister for +// ParamConfigRenderers. +type ParamConfigRendererInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.ParameterDrivenConfigRenderLister + Lister() v1alpha1.ParamConfigRendererLister } -type parameterDrivenConfigRenderInformer struct { +type paramConfigRendererInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc } -// NewParameterDrivenConfigRenderInformer constructs a new informer for ParameterDrivenConfigRender type. +// NewParamConfigRendererInformer constructs a new informer for ParamConfigRenderer type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewParameterDrivenConfigRenderInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredParameterDrivenConfigRenderInformer(client, resyncPeriod, indexers, nil) +func NewParamConfigRendererInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredParamConfigRendererInformer(client, resyncPeriod, indexers, nil) } -// NewFilteredParameterDrivenConfigRenderInformer constructs a new informer for ParameterDrivenConfigRender type. +// NewFilteredParamConfigRendererInformer constructs a new informer for ParamConfigRenderer type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. -func NewFilteredParameterDrivenConfigRenderInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { +func NewFilteredParamConfigRendererInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.ParametersV1alpha1().ParameterDrivenConfigRenders().List(context.TODO(), options) + return client.ParametersV1alpha1().ParamConfigRenderers().List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.ParametersV1alpha1().ParameterDrivenConfigRenders().Watch(context.TODO(), options) + return client.ParametersV1alpha1().ParamConfigRenderers().Watch(context.TODO(), options) }, }, - ¶metersv1alpha1.ParameterDrivenConfigRender{}, + ¶metersv1alpha1.ParamConfigRenderer{}, resyncPeriod, indexers, ) } -func (f *parameterDrivenConfigRenderInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredParameterDrivenConfigRenderInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) +func (f *paramConfigRendererInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredParamConfigRendererInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *parameterDrivenConfigRenderInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(¶metersv1alpha1.ParameterDrivenConfigRender{}, f.defaultInformer) +func (f *paramConfigRendererInformer) Informer() cache.SharedIndexInformer { + return f.factory.InformerFor(¶metersv1alpha1.ParamConfigRenderer{}, f.defaultInformer) } -func (f *parameterDrivenConfigRenderInformer) Lister() v1alpha1.ParameterDrivenConfigRenderLister { - return v1alpha1.NewParameterDrivenConfigRenderLister(f.Informer().GetIndexer()) +func (f *paramConfigRendererInformer) Lister() v1alpha1.ParamConfigRendererLister { + return v1alpha1.NewParamConfigRendererLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/listers/parameters/v1alpha1/expansion_generated.go b/pkg/client/listers/parameters/v1alpha1/expansion_generated.go index e68e235efd3..a0d0d8522c4 100644 --- a/pkg/client/listers/parameters/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/parameters/v1alpha1/expansion_generated.go @@ -26,6 +26,10 @@ type ComponentParameterListerExpansion interface{} // ComponentParameterNamespaceLister. type ComponentParameterNamespaceListerExpansion interface{} +// ParamConfigRendererListerExpansion allows custom methods to be added to +// ParamConfigRendererLister. +type ParamConfigRendererListerExpansion interface{} + // ParameterListerExpansion allows custom methods to be added to // ParameterLister. type ParameterListerExpansion interface{} @@ -34,10 +38,6 @@ type ParameterListerExpansion interface{} // ParameterNamespaceLister. type ParameterNamespaceListerExpansion interface{} -// ParameterDrivenConfigRenderListerExpansion allows custom methods to be added to -// ParameterDrivenConfigRenderLister. -type ParameterDrivenConfigRenderListerExpansion interface{} - // ParametersDefinitionListerExpansion allows custom methods to be added to // ParametersDefinitionLister. type ParametersDefinitionListerExpansion interface{} diff --git a/pkg/client/listers/parameters/v1alpha1/paramconfigrenderer.go b/pkg/client/listers/parameters/v1alpha1/paramconfigrenderer.go new file mode 100644 index 00000000000..f3a7cdcc275 --- /dev/null +++ b/pkg/client/listers/parameters/v1alpha1/paramconfigrenderer.go @@ -0,0 +1,68 @@ +/* +Copyright (C) 2022-2024 ApeCloud Co., Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by lister-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" +) + +// ParamConfigRendererLister helps list ParamConfigRenderers. +// All objects returned here must be treated as read-only. +type ParamConfigRendererLister interface { + // List lists all ParamConfigRenderers in the indexer. + // Objects returned here must be treated as read-only. + List(selector labels.Selector) (ret []*v1alpha1.ParamConfigRenderer, err error) + // Get retrieves the ParamConfigRenderer from the index for a given name. + // Objects returned here must be treated as read-only. + Get(name string) (*v1alpha1.ParamConfigRenderer, error) + ParamConfigRendererListerExpansion +} + +// paramConfigRendererLister implements the ParamConfigRendererLister interface. +type paramConfigRendererLister struct { + indexer cache.Indexer +} + +// NewParamConfigRendererLister returns a new ParamConfigRendererLister. +func NewParamConfigRendererLister(indexer cache.Indexer) ParamConfigRendererLister { + return ¶mConfigRendererLister{indexer: indexer} +} + +// List lists all ParamConfigRenderers in the indexer. +func (s *paramConfigRendererLister) List(selector labels.Selector) (ret []*v1alpha1.ParamConfigRenderer, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1alpha1.ParamConfigRenderer)) + }) + return ret, err +} + +// Get retrieves the ParamConfigRenderer from the index for a given name. +func (s *paramConfigRendererLister) Get(name string) (*v1alpha1.ParamConfigRenderer, error) { + obj, exists, err := s.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1alpha1.Resource("paramconfigrenderer"), name) + } + return obj.(*v1alpha1.ParamConfigRenderer), nil +} diff --git a/pkg/client/listers/parameters/v1alpha1/parameterdrivenconfigrender.go b/pkg/client/listers/parameters/v1alpha1/parameterdrivenconfigrender.go deleted file mode 100644 index ba0192de30f..00000000000 --- a/pkg/client/listers/parameters/v1alpha1/parameterdrivenconfigrender.go +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright (C) 2022-2024 ApeCloud Co., Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// ParameterDrivenConfigRenderLister helps list ParameterDrivenConfigRenders. -// All objects returned here must be treated as read-only. -type ParameterDrivenConfigRenderLister interface { - // List lists all ParameterDrivenConfigRenders in the indexer. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.ParameterDrivenConfigRender, err error) - // Get retrieves the ParameterDrivenConfigRender from the index for a given name. - // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.ParameterDrivenConfigRender, error) - ParameterDrivenConfigRenderListerExpansion -} - -// parameterDrivenConfigRenderLister implements the ParameterDrivenConfigRenderLister interface. -type parameterDrivenConfigRenderLister struct { - indexer cache.Indexer -} - -// NewParameterDrivenConfigRenderLister returns a new ParameterDrivenConfigRenderLister. -func NewParameterDrivenConfigRenderLister(indexer cache.Indexer) ParameterDrivenConfigRenderLister { - return ¶meterDrivenConfigRenderLister{indexer: indexer} -} - -// List lists all ParameterDrivenConfigRenders in the indexer. -func (s *parameterDrivenConfigRenderLister) List(selector labels.Selector) (ret []*v1alpha1.ParameterDrivenConfigRender, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.ParameterDrivenConfigRender)) - }) - return ret, err -} - -// Get retrieves the ParameterDrivenConfigRender from the index for a given name. -func (s *parameterDrivenConfigRenderLister) Get(name string) (*v1alpha1.ParameterDrivenConfigRender, error) { - obj, exists, err := s.indexer.GetByKey(name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("parameterdrivenconfigrender"), name) - } - return obj.(*v1alpha1.ParameterDrivenConfigRender), nil -} diff --git a/pkg/controllerutil/config_util.go b/pkg/controllerutil/config_util.go index 604911855bd..e00ab7ade0b 100644 --- a/pkg/controllerutil/config_util.go +++ b/pkg/controllerutil/config_util.go @@ -243,7 +243,7 @@ func TransformConfigTemplate(configs []appsv1.ComponentConfigSpec) []appsv1.Comp return arr } -func ResolveCmpdParametersDefs(ctx context.Context, reader client.Reader, cmpd *appsv1.ComponentDefinition) (*parametersv1alpha1.ParameterDrivenConfigRender, []*parametersv1alpha1.ParametersDefinition, error) { +func ResolveCmpdParametersDefs(ctx context.Context, reader client.Reader, cmpd *appsv1.ComponentDefinition) (*parametersv1alpha1.ParamConfigRenderer, []*parametersv1alpha1.ParametersDefinition, error) { var paramsDefs []*parametersv1alpha1.ParametersDefinition configRender, err := ResolveComponentConfigRender(ctx, reader, cmpd) @@ -266,15 +266,15 @@ func ResolveCmpdParametersDefs(ctx context.Context, reader client.Reader, cmpd * return configRender, paramsDefs, nil } -func ResolveComponentConfigRender(ctx context.Context, reader client.Reader, cmpd *appsv1.ComponentDefinition) (*parametersv1alpha1.ParameterDrivenConfigRender, error) { - configDefList := ¶metersv1alpha1.ParameterDrivenConfigRenderList{} +func ResolveComponentConfigRender(ctx context.Context, reader client.Reader, cmpd *appsv1.ComponentDefinition) (*parametersv1alpha1.ParamConfigRenderer, error) { + configDefList := ¶metersv1alpha1.ParamConfigRendererList{} if err := reader.List(ctx, configDefList); err != nil { return nil, err } - checkAvailable := func(configDef parametersv1alpha1.ParameterDrivenConfigRender) error { + checkAvailable := func(configDef parametersv1alpha1.ParamConfigRenderer) error { if configDef.Status.Phase != parametersv1alpha1.PDAvailablePhase { - return fmt.Errorf("the referenced ParameterDrivenConfigRender is unavailable: %s", configDef.Name) + return fmt.Errorf("the referenced ParamConfigRenderer is unavailable: %s", configDef.Name) } return nil } diff --git a/pkg/controllerutil/parameter_schema.go b/pkg/controllerutil/parameter_schema.go index 93694890a9e..8485358ab8b 100644 --- a/pkg/controllerutil/parameter_schema.go +++ b/pkg/controllerutil/parameter_schema.go @@ -59,7 +59,7 @@ func ParametersDefinitionTerminalPhases(status parametersv1alpha1.ParametersDefi return status.ObservedGeneration == generation && status.Phase == parametersv1alpha1.PDAvailablePhase } -func ParametersDrivenConfigRenderTerminalPhases(status parametersv1alpha1.ParameterDrivenConfigRenderStatus, generation int64) bool { +func ParametersDrivenConfigRenderTerminalPhases(status parametersv1alpha1.ParamConfigRendererStatus, generation int64) bool { return status.ObservedGeneration == generation && status.Phase == parametersv1alpha1.PDAvailablePhase } @@ -139,7 +139,7 @@ func GetConfigTemplateItem(parameterSpec *parametersv1alpha1.ComponentParameterS return nil } -func GetComponentConfigDescription(pdcr *parametersv1alpha1.ParameterDrivenConfigRenderSpec, name string) *parametersv1alpha1.ComponentConfigDescription { +func GetComponentConfigDescription(pdcr *parametersv1alpha1.ParamConfigRendererSpec, name string) *parametersv1alpha1.ComponentConfigDescription { match := func(desc parametersv1alpha1.ComponentConfigDescription) bool { return desc.Name == name } @@ -150,7 +150,7 @@ func GetComponentConfigDescription(pdcr *parametersv1alpha1.ParameterDrivenConfi return nil } -func GetComponentConfigDescriptions(pdcr *parametersv1alpha1.ParameterDrivenConfigRenderSpec, tpl string) []parametersv1alpha1.ComponentConfigDescription { +func GetComponentConfigDescriptions(pdcr *parametersv1alpha1.ParamConfigRendererSpec, tpl string) []parametersv1alpha1.ComponentConfigDescription { match := func(desc parametersv1alpha1.ComponentConfigDescription) bool { return desc.TemplateName == tpl } diff --git a/pkg/generics/type.go b/pkg/generics/type.go index e80350006de..60c3e0288af 100644 --- a/pkg/generics/type.go +++ b/pkg/generics/type.go @@ -134,7 +134,7 @@ var ParametersDefinitionSignature = func(_ parametersv1alpha1.ParametersDefiniti } var ParameterSignature = func(_ parametersv1alpha1.Parameter, _ *parametersv1alpha1.Parameter, _ parametersv1alpha1.ParameterList, _ *parametersv1alpha1.ParameterList) { } -var ParameterDrivenConfigRenderSignature = func(_ parametersv1alpha1.ParameterDrivenConfigRender, _ *parametersv1alpha1.ParameterDrivenConfigRender, _ parametersv1alpha1.ParameterDrivenConfigRenderList, _ *parametersv1alpha1.ParameterDrivenConfigRenderList) { +var ParamConfigRendererSignature = func(_ parametersv1alpha1.ParamConfigRenderer, _ *parametersv1alpha1.ParamConfigRenderer, _ parametersv1alpha1.ParamConfigRendererList, _ *parametersv1alpha1.ParamConfigRendererList) { } var ComponentParameterSignature = func(_ parametersv1alpha1.ComponentParameter, _ *parametersv1alpha1.ComponentParameter, _ parametersv1alpha1.ComponentParameterList, _ *parametersv1alpha1.ComponentParameterList) { } diff --git a/pkg/testutil/parameters/parameterdrivenconfigrenders_factory.go b/pkg/testutil/parameters/paramconfigrenderer_factory.go similarity index 59% rename from pkg/testutil/parameters/parameterdrivenconfigrenders_factory.go rename to pkg/testutil/parameters/paramconfigrenderer_factory.go index a9c85ad6470..ac8322fc6b5 100644 --- a/pkg/testutil/parameters/parameterdrivenconfigrenders_factory.go +++ b/pkg/testutil/parameters/paramconfigrenderer_factory.go @@ -22,14 +22,14 @@ import ( testapps "github.com/apecloud/kubeblocks/pkg/testutil/apps" ) -type MockParametersDrivenConfigFactory struct { - testapps.BaseFactory[parametersv1alpha1.ParameterDrivenConfigRender, *parametersv1alpha1.ParameterDrivenConfigRender, MockParametersDrivenConfigFactory] +type MockParamConfigRendererFactory struct { + testapps.BaseFactory[parametersv1alpha1.ParamConfigRenderer, *parametersv1alpha1.ParamConfigRenderer, MockParamConfigRendererFactory] } -func NewParametersDrivenConfigFactory(name string) *MockParametersDrivenConfigFactory { - f := &MockParametersDrivenConfigFactory{} - f.Init("", name, ¶metersv1alpha1.ParameterDrivenConfigRender{ - Spec: parametersv1alpha1.ParameterDrivenConfigRenderSpec{ +func NewParamConfigRendererFactory(name string) *MockParamConfigRendererFactory { + f := &MockParamConfigRendererFactory{} + f.Init("", name, ¶metersv1alpha1.ParamConfigRenderer{ + Spec: parametersv1alpha1.ParamConfigRendererSpec{ Configs: []parametersv1alpha1.ComponentConfigDescription{ { Name: MysqlConfigFile, @@ -48,17 +48,17 @@ func NewParametersDrivenConfigFactory(name string) *MockParametersDrivenConfigFa return f } -func (f *MockParametersDrivenConfigFactory) SetParametersDefs(paramsDefs ...string) *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) SetParametersDefs(paramsDefs ...string) *MockParamConfigRendererFactory { f.Get().Spec.ParametersDefs = paramsDefs return f } -func (f *MockParametersDrivenConfigFactory) SetComponentDefinition(cmpd string) *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) SetComponentDefinition(cmpd string) *MockParamConfigRendererFactory { f.Get().Spec.ComponentDef = cmpd return f } -func (f *MockParametersDrivenConfigFactory) safeGetConfigDescription(key string) *parametersv1alpha1.ComponentConfigDescription { +func (f *MockParamConfigRendererFactory) safeGetConfigDescription(key string) *parametersv1alpha1.ComponentConfigDescription { desc := intctrlutil.GetComponentConfigDescription(&f.Get().Spec, key) if desc != nil { return desc @@ -69,39 +69,33 @@ func (f *MockParametersDrivenConfigFactory) safeGetConfigDescription(key string) return intctrlutil.GetComponentConfigDescription(&f.Get().Spec, key) } -func (f *MockParametersDrivenConfigFactory) SetConfigDescription(key, tpl string, formatter parametersv1alpha1.FileFormatConfig) *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) SetConfigDescription(key, tpl string, formatter parametersv1alpha1.FileFormatConfig) *MockParamConfigRendererFactory { desc := f.safeGetConfigDescription(key) desc.TemplateName = tpl desc.FileFormatConfig = formatter.DeepCopy() return f } -func (f *MockParametersDrivenConfigFactory) SetTemplateName(tpl string) *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) SetTemplateName(tpl string) *MockParamConfigRendererFactory { desc := f.safeGetConfigDescription(MysqlConfigFile) desc.TemplateName = tpl return f } -func (f *MockParametersDrivenConfigFactory) HScaleEnabled() *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) HScaleEnabled() *MockParamConfigRendererFactory { desc := f.safeGetConfigDescription(MysqlConfigFile) desc.ReRenderResourceTypes = append(desc.ReRenderResourceTypes, parametersv1alpha1.ComponentHScaleType) return f } -func (f *MockParametersDrivenConfigFactory) TLSEnabled() *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) TLSEnabled() *MockParamConfigRendererFactory { desc := f.safeGetConfigDescription(MysqlConfigFile) desc.ReRenderResourceTypes = append(desc.ReRenderResourceTypes, parametersv1alpha1.ComponentTLSType) return f } -func (f *MockParametersDrivenConfigFactory) VScaleEnabled() *MockParametersDrivenConfigFactory { +func (f *MockParamConfigRendererFactory) VScaleEnabled() *MockParamConfigRendererFactory { desc := f.safeGetConfigDescription(MysqlConfigFile) desc.ReRenderResourceTypes = append(desc.ReRenderResourceTypes, parametersv1alpha1.ComponentVScaleType) return f } - -func (f *MockParametersDrivenConfigFactory) SetInjectEnv(containers ...string) *MockParametersDrivenConfigFactory { - desc := f.safeGetConfigDescription(MysqlConfigFile) - desc.InjectEnvTo = containers - return f -}