fix

Signed-off-by: zhaohehuhu <luoyedeyi@163.com>

Author: zhaohehuhu

pkg/subcontrollers/feobserver/feobserver_config.go

@@ -36,6 +36,7 @@ import (
 	"github.com/StarRocks/starrocks-kubernetes-operator/pkg/k8sutils/templates/pod"
 	"github.com/StarRocks/starrocks-kubernetes-operator/pkg/k8sutils/templates/statefulset"
 	"github.com/StarRocks/starrocks-kubernetes-operator/pkg/subcontrollers"
+	"github.com/StarRocks/starrocks-kubernetes-operator/pkg/subcontrollers/fe"
 )
 
 type FeObserverController struct {
@@ -83,19 +84,19 @@ func (fc *FeObserverController) SyncCluster(ctx context.Context, src *srapi.Star
 		return err
 	}
 
-	// get the fe observer configMap for resolve ports
-	logger.V(log.DebugLevel).Info("get fe observer configMap to resolve ports", "ConfigMapInfo", observerSpec.ComponentSpec.ConfigMapInfo)
-	observerConfig, err := GetFEObserverConfig(ctx, fc.Client, observerSpec, src.Namespace)
+	// get the fe configMap for resolve ports
+	logger.V(log.DebugLevel).Info("get fe configMap to resolve ports", "ConfigMapInfo", feSpec.ConfigMapInfo)
+	feConfig, err := fe.GetFEConfig(ctx, fc.Client, feSpec, src.Namespace)
 	if err != nil {
-		logger.Error(err, "get fe observer config failed", "ConfigMapInfo", observerSpec.ComponentSpec.ConfigMapInfo)
+		logger.Error(err, "get fe config failed", "ConfigMapInfo", feSpec.ConfigMapInfo)
 		return err
 	}
 
 	// generate new fe observer statefulset.
 	logger.V(log.DebugLevel).Info("build fe observer statefulset", "StarRocksCluster", src)
 	object := object.NewFromCluster(src)
 
-	podTemplateSpec, err := fc.buildPodTemplate(src, observerConfig)
+	podTemplateSpec, err := fc.buildPodTemplate(src, feConfig)
 	if err != nil {
 		logger.Error(err, "build pod template failed")
 		return err

pkg/subcontrollers/feobserver/feobserver_controller.go

@@ -19,7 +19,6 @@ package feobserver_test
 import (
 	"context"
 	"os"
-	"reflect"
 	"testing"
 	"time"
 
@@ -272,109 +271,3 @@ func TestFeObserver_Ready(t *testing.T) {
 		})
 	}
 }
-
-func TestGetFEObserverConfig(t *testing.T) {
-	type args struct {
-		ctx          context.Context
-		observerSpec *srapi.StarRocksFeObserverSpec
-		namespace    string
-	}
-	type fields struct {
-		k8sClient client.Client
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    map[string]interface{}
-		wantErr bool
-	}{
-		{
-			name: "get config from ConfigMapInfo",
-			fields: fields{
-				k8sClient: fake.NewFakeClient(srapi.Scheme, &corev1.ConfigMap{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "feobserver-config",
-						Namespace: "default",
-					},
-					Data: map[string]string{
-						"fe.conf": "aa = bb",
-					},
-				}),
-			},
-			args: args{
-				ctx: context.Background(),
-				observerSpec: &srapi.StarRocksFeObserverSpec{
-					ComponentSpec: srapi.StarRocksComponentSpec{
-						StarRocksLoadSpec: srapi.StarRocksLoadSpec{
-							ConfigMapInfo: srapi.ConfigMapInfo{
-								ConfigMapName: "feobserver-config",
-								ResolveKey:    "fe.conf",
-							},
-						},
-					},
-				},
-				namespace: "default",
-			},
-			want: map[string]interface{}{
-				"aa": "bb",
-			},
-		},
-		{
-			name: "get config from configMaps with matching subpath",
-			fields: fields{
-				k8sClient: fake.NewFakeClient(srapi.Scheme, &corev1.ConfigMap{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "feobserver-config",
-						Namespace: "default",
-					},
-					Data: map[string]string{
-						"fe.conf": "cc = dd",
-					},
-				}),
-			},
-			args: args{
-				ctx: context.Background(),
-				observerSpec: &srapi.StarRocksFeObserverSpec{
-					ComponentSpec: srapi.StarRocksComponentSpec{
-						ConfigMaps: []srapi.ConfigMapReference{
-							{
-								Name:      "feobserver-config",
-								MountPath: "/opt/starrocks/fe/conf/fe.conf",
-								SubPath:   "fe.conf",
-							},
-						},
-					},
-				},
-				namespace: "default",
-			},
-			want: map[string]interface{}{
-				"cc": "dd",
-			},
-		},
-		{
-			name: "get empty config",
-			fields: fields{
-				k8sClient: fake.NewFakeClient(srapi.Scheme),
-			},
-			args: args{
-				ctx:          context.Background(),
-				observerSpec: &srapi.StarRocksFeObserverSpec{},
-				namespace:    "default",
-			},
-			want: map[string]interface{}{},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := feobserver.GetFEObserverConfig(tt.args.ctx, tt.fields.k8sClient, tt.args.observerSpec, tt.args.namespace)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("GetFEObserverConfig() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("GetFEObserverConfig() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}