Merge branch 'master' of github.com:oceanbase/ob-operator into wt-ds040-nodeBugfix

Author: TianWuwt

build/Dockerfile.dashboard

@@ -6,7 +6,7 @@ RUN yarn
 RUN yarn build
 
 FROM golang:1.22 AS builder-be
-ARG GOPROXY=https://goproxy.cn,direct
+ARG GOPROXY=https://goproxy.io,direct
 ARG GOSUMDB=sum.golang.org
 ARG COMMIT_HASH=unknown
 WORKDIR /workspace
@@ -16,10 +16,10 @@ RUN make dashboard-build
 # start build docker image
 FROM openanolis/anolisos:8.8
 WORKDIR /root
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN yum update -y && yum install -y mysql && yum clean all
 COPY --from=builder-be /workspace/bin/oceanbase-dashboard .
 COPY --from=builder-fe /workspace/dist ./ui/dist
-RUN yum update -y && yum install -y mysql && yum clean all
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 USER root
 
 ENTRYPOINT ["/root/oceanbase-dashboard"]

charts/oceanbase-dashboard/templates/cluster-role.yaml

@@ -12,6 +12,11 @@ rules:
     resources:
       - "*"
     verbs: ["get", "list", "watch", "update", "create", "delete", "patch"]
+  - apiGroups:
+      - k8s.oceanbase.com
+    resources:
+      - "*"
+    verbs: ["get", "list", "watch", "update", "create", "delete", "patch"]
   - apiGroups:
       - ""
     resources:

internal/clients/obcluster.go

@@ -170,3 +170,19 @@ func GetPodOfOBServer(ctx context.Context, observer *v1alpha1.OBServer) (*corev1
 	}
 	return pod, nil
 }
+
+func ListOBParametersOfOBCluster(ctx context.Context, obcluster *v1alpha1.OBCluster) (*v1alpha1.OBParameterList, error) {
+	client := client.GetClient()
+	var obparameterList v1alpha1.OBParameterList
+	obj, err := client.DynamicClient.Resource(schema.OBParameterGVR).Namespace(obcluster.Namespace).List(ctx, metav1.ListOptions{
+		LabelSelector: fmt.Sprintf("%s=%s", oceanbaseconst.LabelRefUID, string(obcluster.GetUID())),
+	})
+	if err != nil {
+		return nil, errors.Wrap(err, "List obparameters")
+	}
+	err = runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &obparameterList)
+	if err != nil {
+		return nil, errors.Wrap(err, "Convert unstructured to obparameter list")
+	}
+	return &obparameterList, nil
+}

internal/clients/schema/obparameter.go

@@ -0,0 +1,30 @@
+/*
+Copyright (c) 2025 OceanBase
+ob-operator is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.
+*/
+
+package schema
+
+import "k8s.io/apimachinery/pkg/runtime/schema"
+
+const (
+	OBParameterGroup    = "oceanbase.oceanbase.com"
+	OBParameterVersion  = "v1alpha1"
+	OBParameterKind     = "OBParameter"
+	OBParameterResource = "obparameters"
+)
+
+var (
+	OBParameterGVR = schema.GroupVersionResource{
+		Group:    OBParameterGroup,
+		Version:  OBParameterVersion,
+		Resource: OBParameterResource,
+	}
+)

internal/dashboard/business/k8s/utils.go

@@ -38,7 +38,11 @@ func GetClientForK8sCluster(ctx context.Context, clusterName string) (*client.Cl
 	if err != nil {
 		return nil, errors.Wrap(err, "Get k8s cluster")
 	}
-	return client.GetClientFromBytes([]byte(k8sCluster.Spec.KubeConfig))
+	kubeConfig, err := k8sCluster.DecodeKubeConfig()
+	if err != nil {
+		return nil, errors.Wrap(err, "Decode kubeconfig")
+	}
+	return client.GetClientFromBytes(kubeConfig)
 }
 
 func ListK8sClusterEvents(ctx context.Context, c *client.Client, queryEventParam *param.QueryEventParam) ([]response.K8sEvent, error) {
@@ -127,7 +131,7 @@ func ListK8sClusterEvents(ctx context.Context, c *client.Client, queryEventParam
 func ListK8sClusterNodes(ctx context.Context, c *client.Client) ([]response.K8sNode, error) {
 	nodeList, err := c.ClientSet.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
 	nodes := make([]response.K8sNode, 0)
-	nodeMetricsMap, metricsErr := resource.ListNodeMetrics(ctx)
+	nodeMetricsMap, metricsErr := resource.ListNodeMetrics(ctx, c)
 	if err == nil {
 		for _, node := range nodeList.Items {
 			internalAddress, externalAddress := extractNodeAddress(&node)
@@ -232,3 +236,7 @@ func BatchUpdateK8sClusterNodes(ctx context.Context, c *client.Client, updateNod
 	}
 	return nil
 }
+
+func GetPod(ctx context.Context, c *client.Client, namespace string, name string) (*corev1.Pod, error) {
+	return c.ClientSet.CoreV1().Pods(namespace).Get(ctx, name, metav1.GetOptions{})
+}

internal/dashboard/business/oceanbase/obcluster.go

@@ -33,11 +33,13 @@ import (
 	clusterstatus "github.com/oceanbase/ob-operator/internal/const/status/obcluster"
 	"github.com/oceanbase/ob-operator/internal/dashboard/business/common"
 	"github.com/oceanbase/ob-operator/internal/dashboard/business/constant"
+	"github.com/oceanbase/ob-operator/internal/dashboard/business/k8s"
 	modelcommon "github.com/oceanbase/ob-operator/internal/dashboard/model/common"
 	"github.com/oceanbase/ob-operator/internal/dashboard/model/param"
 	"github.com/oceanbase/ob-operator/internal/dashboard/model/response"
 	"github.com/oceanbase/ob-operator/internal/dashboard/utils"
 	oberr "github.com/oceanbase/ob-operator/pkg/errors"
+	"github.com/oceanbase/ob-operator/pkg/k8s/client"
 	"github.com/oceanbase/ob-operator/pkg/oceanbase-sdk/model"
 )
 
@@ -122,17 +124,19 @@ func buildOBClusterResponse(ctx context.Context, obcluster *v1alpha1.OBCluster)
 		logger.WithError(err).Info("Failed to get OceanBase database connection")
 		return nil, errors.Wrapf(err, "Failed to get connection of obcluster")
 	}
+	versionStr := ""
 	version, err := conn.GetVersion(ctx)
 	if err != nil {
 		logger.WithError(err).Info("Failed to get OceanBase database version")
-		return nil, errors.Wrapf(err, "Failed to get version of obcluster")
+	} else {
+		versionStr = version.Version
 	}
 
 	respCluster := &response.OBCluster{
 		OBClusterOverview: *overview,
 		OBClusterExtra: response.OBClusterExtra{
 			RootPasswordSecret: obcluster.Spec.UserSecrets.Root,
-			Version:            version.Version,
+			Version:            versionStr,
 			Parameters:         nil,
 		},
 		Metrics: nil,
@@ -216,13 +220,21 @@ func buildOBClusterTopologyResp(ctx context.Context, obcluster *v1alpha1.OBClust
 		sort.Slice(observerList.Items, func(i, j int) bool {
 			return observerList.Items[i].Name < observerList.Items[j].Name
 		})
+		c := client.GetClient()
+		if obzone.Spec.Topology.K8sCluster != "" {
+			c, err = k8s.GetClientForK8sCluster(ctx, obzone.Spec.Topology.K8sCluster)
+			if err != nil {
+				return nil, errors.Wrap(err, fmt.Sprintf("Get client for k8s cluster %s", obzone.Spec.Topology.K8sCluster))
+			}
+		}
 		for _, observer := range observerList.Items {
 			logger.Debugf("Add observer %s to result", observer.Name)
 			// compatible with old version CRD
 			nodeName := observer.Status.NodeName
 			if nodeName == "" {
 				logger.Debugf("Get node name of observer %s", observer.Name)
-				pod, err := clients.GetPodOfOBServer(ctx, &observer)
+				// pod name is the same as observer's name
+				pod, err := k8s.GetPod(ctx, c, observer.Namespace, observer.Name)
 				if err == nil {
 					nodeName = pod.Spec.NodeName
 				}
@@ -370,7 +382,7 @@ func buildOBClusterTopologyResp(ctx context.Context, obcluster *v1alpha1.OBClust
 			Tolerations:  tolerations,
 		}
 		if len(obzone.Status.OBServerStatus) > 0 {
-			respZone.RootService = obzone.Status.OBServerStatus[0].Server
+			respZone.RootService = obzone.Status.OBServerStatus[0].GetConnectAddr()
 		}
 		topology = append(topology, respZone)
 	}
@@ -467,6 +479,7 @@ func buildOBClusterTopology(topology []param.ZoneTopology) []apitypes.OBZoneTopo
 			Zone:         zone.Zone,
 			NodeSelector: common.KVsToMap(zone.NodeSelector),
 			Replica:      zone.Replicas,
+			K8sCluster:   zone.K8sCluster,
 		}
 		if len(zone.Affinities) > 0 {
 			topo.Affinity = &corev1.Affinity{}
@@ -742,6 +755,7 @@ func AddOBZone(ctx context.Context, obclusterIdentity *param.K8sObjectIdentity,
 		Zone:         zone.Zone,
 		NodeSelector: common.KVsToMap(zone.NodeSelector),
 		Replica:      zone.Replicas,
+		K8sCluster:   zone.K8sCluster,
 	})
 	cluster, err := clients.UpdateOBCluster(ctx, obcluster)
 	if err != nil {
@@ -967,13 +981,18 @@ func ListOBClusterParameters(ctx context.Context, nn *param.K8sObjectIdentity) (
 		logger.WithError(err).Info("Failed to get OceanBase database connection")
 		return nil, errors.Wrapf(err, "Failed to get connection go obcluster")
 	}
+	parameterList, err := clients.ListOBParametersOfOBCluster(ctx, obcluster)
+	if err != nil {
+		logger.WithError(err).Error("Failed to list parameters")
+		return nil, errors.New("Failed to list obcluster parameters in k8s")
+	}
 	parameters, err := conn.ListClusterParameters(ctx)
 	if err != nil {
 		logger.WithError(err).Error("Failed to query parameters")
-		return nil, errors.New("Failed to list obcluster parameters")
+		return nil, errors.New("Failed to list obcluster parameters in obcluster")
 	}
 	// convert to response data structure
-	aggParameters := aggregrateParametersByName(parameters)
+	aggParameters := aggregrateParameters(parameterList.Items, parameters)
 	return aggParameters, nil
 }
 
@@ -1033,7 +1052,7 @@ func aggregrateParameterByName(parameters []*model.Parameter) response.Aggregate
 	}
 }
 
-func aggregrateParametersByName(parameters []*model.Parameter) []response.AggregatedParameter {
+func aggregrateParameters(obparameters []v1alpha1.OBParameter, parameters []*model.Parameter) []response.AggregatedParameter {
 	aggMap := make(map[string][]*model.Parameter)
 	for _, parameter := range parameters {
 		parameterList, exists := aggMap[parameter.Name]
@@ -1044,8 +1063,15 @@ func aggregrateParametersByName(parameters []*model.Parameter) []response.Aggreg
 		aggMap[parameter.Name] = parameterList
 	}
 	aggParameters := make([]response.AggregatedParameter, 0)
-	for _, parameterList := range aggMap {
+	for name, parameterList := range aggMap {
 		aggParameter := aggregrateParameterByName(parameterList)
+		for _, obparameter := range obparameters {
+			if name == obparameter.Spec.Parameter.Name {
+				aggParameter.IsManagedByOperator = true
+				aggParameter.Status = obparameter.Status.Status
+				break
+			}
+		}
 		aggParameters = append(aggParameters, aggParameter)
 	}
 	return aggParameters

internal/dashboard/business/oceanbase/obtenant.go

@@ -289,7 +289,7 @@ func CreateOBTenant(ctx context.Context, nn types.NamespacedName, p *param.Creat
 
 	// use password from root credential
 	if p.RootCredential != "" {
-		rootSecret, err := k8sclient.ClientSet.CoreV1().Secrets(t.Namespace).Get(ctx, p.RootCredential, v1.GetOptions{})
+		rootSecret, err := k8sclient.ClientSet.CoreV1().Secrets(p.SecretNamespace).Get(ctx, p.RootCredential, v1.GetOptions{})
 		if err != nil {
 			return nil, oberr.NewInternal(err.Error())
 		}
@@ -384,7 +384,7 @@ func CreateOBTenant(ctx context.Context, nn types.NamespacedName, p *param.Creat
 	if p.Source != nil && p.Source.Restore != nil {
 		// extract BakEncryptionPassword and OSS ak/sk
 		if p.Source.Restore.BakEncryptionSecret != "" {
-			bakEncryptionSecret, err := k8sclient.ClientSet.CoreV1().Secrets(t.Namespace).Get(ctx, p.Source.Restore.BakEncryptionSecret, v1.GetOptions{})
+			bakEncryptionSecret, err := k8sclient.ClientSet.CoreV1().Secrets(p.SecretNamespace).Get(ctx, p.Source.Restore.BakEncryptionSecret, v1.GetOptions{})
 			if err != nil {
 				return nil, oberr.NewInternal(err.Error())
 			}
@@ -393,7 +393,7 @@ func CreateOBTenant(ctx context.Context, nn types.NamespacedName, p *param.Creat
 			}
 		}
 		if p.Source.Restore.OSSAccessSecret != "" {
-			ossAccessSecret, err := k8sclient.ClientSet.CoreV1().Secrets(t.Namespace).Get(ctx, p.Source.Restore.OSSAccessSecret, v1.GetOptions{})
+			ossAccessSecret, err := k8sclient.ClientSet.CoreV1().Secrets(p.SecretNamespace).Get(ctx, p.Source.Restore.OSSAccessSecret, v1.GetOptions{})
 			if err != nil {
 				return nil, oberr.NewInternal(err.Error())
 			}

internal/dashboard/handler/const.go

@@ -0,0 +1,17 @@
+/*
+Copyright (c) 2025 OceanBase
+ob-operator is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.
+*/
+
+package handler
+
+const (
+	HEADER_ENCRYPTED_KEY string = "X-Encrypted-Key"
+)

internal/dashboard/handler/helper.go

@@ -112,6 +112,8 @@ func extractPassword(param *param.CreateOBClusterParam) error {
 	if err != nil {
 		return err
 	}
-	param.ProxyroPassword, err = crypto.DecryptWithPrivateKey(param.ProxyroPassword)
+	if param.ProxyroPassword != "" {
+		param.ProxyroPassword, err = crypto.DecryptWithPrivateKey(param.ProxyroPassword)
+	}
 	return err
 }

internal/dashboard/handler/obtenant_handler.go

@@ -150,6 +150,9 @@ func CreateTenant(c *gin.Context) (*response.OBTenantDetail, error) {
 		return nil, httpErr.New(httpErr.ErrPermissionDenied, "Permission denied")
 	}
 
+	if tenantParam.SecretNamespace == "" {
+		tenantParam.SecretNamespace = "default"
+	}
 	if tenantParam.RootPassword != "" {
 		tenantParam.RootPassword, err = crypto.DecryptWithPrivateKey(tenantParam.RootPassword)
 		if err != nil {