(dubbo-kubernetes) branch master updated: [operator] update yaml (#618)

[zhongxjian]

This is an automated email from the ASF dual-hosted git repository.

zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
     new ddaf3769 [operator] update yaml (#618)
ddaf3769 is described below

commit ddaf376940a0890a7e7f053f47e98f46f1991c53
Author: Jian Zhong <11638...@qq.com>
AuthorDate: Thu Feb 20 15:20:41 2025 +0800

    [operator] update yaml (#618)
---
 operator/pkg/apis/types.go          |  7 +------
 operator/pkg/component/component.go |  6 +++---
 pkg/util/pointer/pointer.go         | 17 -----------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/operator/pkg/apis/types.go b/operator/pkg/apis/types.go
index 62507357..dbab4f81 100644
--- a/operator/pkg/apis/types.go
+++ b/operator/pkg/apis/types.go
@@ -48,18 +48,13 @@ type DashboardComponentSpec struct {
 }
 
 type RegisterComponentSpec struct {
-       Enabled *BoolValue `json:"enabled,omitempty"`
-}
-
-// TODO Remove?
-type ComponentSpec struct {
        Enabled   *BoolValue     `json:"enabled,omitempty"`
        Namespace string         `json:"namespace,omitempty"`
        Raw       map[string]any `json:"-"`
 }
 
 type MetadataCompSpec struct {
-       ComponentSpec
+       RegisterComponentSpec
 }
 
 type BoolValue struct {
diff --git a/operator/pkg/component/component.go 
b/operator/pkg/component/component.go
index 19bed2d4..6c7b7cbc 100644
--- a/operator/pkg/component/component.go
+++ b/operator/pkg/component/component.go
@@ -60,7 +60,7 @@ var AllComponents = []Component{
                ResourceType:       "StatefulSet",
                ResourceName:       "register",
                ContainerName:      "register-discovery",
-               Default:            false,
+               Default:            true,
                HelmSubDir:         
"dubbo-control/register-discovery/zookeeper",
                HelmValuesTreeRoot: "zookeeper",
        },
@@ -97,7 +97,7 @@ func (c Component) Get(merged values.Map) 
([]apis.MetadataCompSpec, error) {
        def := c.Default
        if def {
                defaultResp = []apis.MetadataCompSpec{{
-                       ComponentSpec: apis.ComponentSpec{
+                       RegisterComponentSpec: apis.RegisterComponentSpec{
                                Namespace: defaultNamespace,
                        }},
                }
@@ -114,7 +114,6 @@ func (c Component) Get(merged values.Map) 
([]apis.MetadataCompSpec, error) {
                if spec.Namespace == "" {
                        spec.Namespace = "dubbo-system"
                }
-
                spec.Raw = m
                return spec, nil
        }
@@ -137,6 +136,7 @@ func (c Component) Get(merged values.Map) 
([]apis.MetadataCompSpec, error) {
                if !ok {
                        return defaultResp, nil
                }
+
                spec, err := buildSpec(s)
                if err != nil {
                        return nil, err
diff --git a/pkg/util/pointer/pointer.go b/pkg/util/pointer/pointer.go
index 8bb9f2e8..03e6595a 100644
--- a/pkg/util/pointer/pointer.go
+++ b/pkg/util/pointer/pointer.go
@@ -17,23 +17,6 @@
 
 package pointer
 
-// Deref returns the value the pointer points to. If ptr is nil the function 
returns zero value
-func Deref[T any](ptr *T) T {
-       if ptr == nil {
-               var zero T
-               return zero
-       }
-       return *ptr
-}
-
-func DerefOr[T any](ptr *T, def T) T {
-       if ptr == nil {
-               return def
-       }
-       return *ptr
-}
-
-// To returns pointer to the passed value
 func To[T any](t T) *T {
        return &t
 }