fix: CR suggestions

oceanbase · Oct 9, 2023 · 803d430 · 803d430
1 parent 6dea4c9
commit 803d430
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -210,8 +210,9 @@ commit-hook: $(GOLANGCI_LINT) ## Install commit hook.
 .PHONY: connect
 connect:
 ifdef TENANT
+	$(eval nodeHost = $(shell kubectl get pods -o jsonpath='{.items[1].status.podIP}'))
 	$(eval pwd = $(shell kubectl get secret $(shell kubectl get obtenant ${TENANT} -o jsonpath='{.status.credentials.root}') -o jsonpath='{.data.password}' | base64 -d))
-	$(if $(strip $(pwd)), mysql -h$(shell kubectl get pods -o jsonpath='{.items[1].status.podIP}') -P2881 -A -uroot@${TENANT} -p$(pwd) -Doceanbase, mysql -h$(shell kubectl get pods -o jsonpath='{.items[1].status.podIP}') -P2881 -A -uroot@${TENANT} -Doceanbase)
+	$(if $(strip $(pwd)), mysql -h$(nodeHost) -P2881 -A -uroot@${TENANT} -p$(pwd) -Doceanbase, mysql -h$(nodeHost) -P2881 -A -uroot@${TENANT} -Doceanbase)
 else
-	mysql -h$(shell kubectl get pods -o jsonpath='{.items[1].status.podIP}') -P2881 -A -uroot -proot -Doceanbase
+	mysql -h$(shell kubectl get pods -o jsonpath='{.items[1].status.podIP}') -P2881 -A -uroot -p -Doceanbase
 endif
diff --git a/api/v1alpha1/obcluster_types.go b/api/v1alpha1/obcluster_types.go
@@ -53,7 +53,6 @@ type OBClusterStatus struct {
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.status"
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
-//+kubebuilder:printcolumn:name="Task",type="string",JSONPath=".status.operationContext.task"
 
 // OBCluster is the Schema for the obclusters API
 type OBCluster struct {

diff --git a/api/v1alpha1/observer_types.go b/api/v1alpha1/observer_types.go
@@ -56,9 +56,8 @@ type OBServerStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:printcolumn:name="NodeIP",type="string",JSONPath=".status.nodeIp"
+//+kubebuilder:printcolumn:name="PodIP",type="string",JSONPath=".status.podIp"
 //+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.status"
-//+kubebuilder:printcolumn:name="ClusterName",type="string",JSONPath=".spec.clusterName"
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+kubebuilder:printcolumn:name="OBStatus",type="string",JSONPath=".status.obStatus"
 

diff --git a/api/v1alpha1/obtenant_types.go b/api/v1alpha1/obtenant_types.go
@@ -48,7 +48,7 @@ type OBTenantSpec struct {
 	//+kubebuilder:default=PRIMARY
 	TenantRole  constants.TenantRole `json:"tenantRole,omitempty"`
 	Source      *TenantSourceSpec    `json:"source,omitempty"`
-	Credentials TenantCredentials    `json:"credentials,omitempty"`
+	Credentials TenantCredentials    `json:"credentials"`
 }
 
 type TenantCredentials struct {

diff --git a/api/v1alpha1/obtenantoperation_types.go b/api/v1alpha1/obtenantoperation_types.go
@@ -65,6 +65,7 @@ type OBTenantOperationStatus struct {
 //+kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.type`
 //+kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.status`
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+//+kubebuilder:printcolumn:name="Cluster",type=string,JSONPath=".status.primaryTenant.spec.obcluster"
 //+kubebuilder:printcolumn:name="PrimaryTenant",type=string,JSONPath=".status.primaryTenant.spec.tenantName"
 //+kubebuilder:printcolumn:name="SecondaryTenant",type=string,JSONPath=".status.secondaryTenant.spec.tenantName",priority=1
 

diff --git a/config/crd/bases/oceanbase.oceanbase.com_obclusters.yaml b/config/crd/bases/oceanbase.oceanbase.com_obclusters.yaml
@@ -21,9 +21,6 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    - jsonPath: .status.operationContext.task
-      name: Task
-      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:

diff --git a/config/crd/bases/oceanbase.oceanbase.com_observers.yaml b/config/crd/bases/oceanbase.oceanbase.com_observers.yaml
@@ -15,15 +15,12 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.nodeIp
-      name: NodeIP
+    - jsonPath: .status.podIp
+      name: PodIP
       type: string
     - jsonPath: .status.status
       name: Status
       type: string
-    - jsonPath: .spec.clusterName
-      name: ClusterName
-      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date

diff --git a/config/crd/bases/oceanbase.oceanbase.com_obtenantoperations.yaml b/config/crd/bases/oceanbase.oceanbase.com_obtenantoperations.yaml
@@ -24,6 +24,9 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - jsonPath: .status.primaryTenant.spec.obcluster
+      name: Cluster
+      type: string
     - jsonPath: .status.primaryTenant.spec.tenantName
       name: PrimaryTenant
       type: string

diff --git a/pkg/resource/obtenant_manager.go b/pkg/resource/obtenant_manager.go
@@ -252,7 +252,7 @@ func (m *OBTenantManager) GetTaskFunc(taskName string) (func() error, error) {
 	case taskname.CreateEmptyStandbyTenant:
 		return m.CreateEmptyStandbyTenant, nil
 	case taskname.CreateUsersByCredentials:
-		return m.CreateUserByCredentialSecrets, nil
+		return m.CreateUserWithCredentialSecrets, nil
 	case taskname.CheckPrimaryTenantLSIntegrity:
 		return m.CheckPrimaryTenantLSIntegrity, nil
 	default:

diff --git a/pkg/resource/obtenant_task.go b/pkg/resource/obtenant_task.go
@@ -1078,12 +1078,12 @@ func (m *OBTenantManager) deleteUnitConfig() error {
 	return nil
 }
 
-func (m *OBTenantManager) CreateUserByCredentialSecrets() error {
+func (m *OBTenantManager) CreateUserWithCredentialSecrets() error {
 	if m.OBTenant.Spec.TenantRole == constants.TenantRoleStandby {
 		// standby tenant can not need to create user
 		return nil
 	}
-	err := m.createUserByCredentials()
+	err := m.createUserWithCredentials()
 	if err != nil {
 		m.Recorder.Event(m.OBTenant, corev1.EventTypeWarning, "Failed to create user or change password", err.Error())
 		m.Logger.Error(err, "Failed to create user or change password, please check the credential secrets")
@@ -1092,7 +1092,7 @@ func (m *OBTenantManager) CreateUserByCredentialSecrets() error {
 	return nil
 }
 
-func (m *OBTenantManager) createUserByCredentials() error {
+func (m *OBTenantManager) createUserWithCredentials() error {
 	con, err := m.getTenantClient()
 	if err != nil {
 		return err

diff --git a/pkg/resource/obtenantoperation_task.go b/pkg/resource/obtenantoperation_task.go
@@ -27,7 +27,7 @@ import (
 )
 
 func (m *ObTenantOperationManager) ChangeTenantRootPassword() error {
-	con, err := m.getTenantSysClient(m.Resource.Spec.ChangePwd.Tenant)
+	con, err := m.getTenantRootClient(m.Resource.Spec.ChangePwd.Tenant)
 	if err != nil {
 		return err
 	}
@@ -122,7 +122,7 @@ func (m *ObTenantOperationManager) CreateUsersForActivatedStandby() error {
 	// Hack:
 	tenantManager.OBTenant.ObjectMeta.SetNamespace(m.Resource.Namespace)
 	// Just reuse the logic of creating users for new coming tenant
-	_ = tenantManager.createUserByCredentials()
+	_ = tenantManager.createUserWithCredentials()
 	return nil
 }
 
@@ -230,7 +230,7 @@ func (m *ObTenantOperationManager) SetTenantLogRestoreSource() error {
 			Logger:   m.Logger,
 			OBTenant: originStandby,
 		}
-		err = tenantManager.createUserByCredentials()
+		err = tenantManager.createUserWithCredentials()
 		if err != nil {
 			return err
 		}
@@ -256,7 +256,7 @@ func (m *ObTenantOperationManager) SetTenantLogRestoreSource() error {
 }
 
 // get operation manager to exec sql
-func (m *ObTenantOperationManager) getTenantSysClient(tenantName string) (*operation.OceanbaseOperationManager, error) {
+func (m *ObTenantOperationManager) getTenantRootClient(tenantName string) (*operation.OceanbaseOperationManager, error) {
 	tenant := &v1alpha1.OBTenant{}
 	err := m.Client.Get(m.Ctx, types.NamespacedName{
 		Namespace: m.Resource.Namespace,

diff --git a/pkg/task/all.go b/pkg/task/all.go
@@ -80,8 +80,8 @@ func init() {
 	GetRegistry().Register(flowname.RestoreAsStandbyFlow, RestoreAsStandby)
 
 	// tenant operation
-	GetRegistry().Register(flowname.ChangeTenantRootPasswordFlow, FlowChangeTenantRootPassword)
-	GetRegistry().Register(flowname.ActivateStandbyTenantFlow, FlowActivateStandbyTenantOp)
-	GetRegistry().Register(flowname.SwitchoverTenantsFlow, FlowSwitchoverTenants)
-	GetRegistry().Register(flowname.RevertSwitchoverTenantsFlow, FlowRevertSwitchoverTenants)
+	GetRegistry().Register(flowname.ChangeTenantRootPasswordFlow, ChangeTenantRootPassword)
+	GetRegistry().Register(flowname.ActivateStandbyTenantFlow, ActivateStandbyTenantOp)
+	GetRegistry().Register(flowname.SwitchoverTenantsFlow, SwitchoverTenants)
+	GetRegistry().Register(flowname.RevertSwitchoverTenantsFlow, RevertSwitchoverTenants)
 }
diff --git a/pkg/task/obtenant_operation_flow.go b/pkg/task/obtenant_operation_flow.go
@@ -20,7 +20,7 @@ import (
 	"github.com/oceanbase/ob-operator/pkg/task/strategy"
 )
 
-func FlowChangeTenantRootPassword() *TaskFlow {
+func ChangeTenantRootPassword() *TaskFlow {
 	return &TaskFlow{
 		OperationContext: &v1alpha1.OperationContext{
 			Name: flowname.ChangeTenantRootPasswordFlow,
@@ -35,7 +35,7 @@ func FlowChangeTenantRootPassword() *TaskFlow {
 	}
 }
 
-func FlowActivateStandbyTenantOp() *TaskFlow {
+func ActivateStandbyTenantOp() *TaskFlow {
 	return &TaskFlow{
 		OperationContext: &v1alpha1.OperationContext{
 			Name: flowname.ActivateStandbyTenantFlow,
@@ -51,7 +51,7 @@ func FlowActivateStandbyTenantOp() *TaskFlow {
 	}
 }
 
-func FlowSwitchoverTenants() *TaskFlow {
+func SwitchoverTenants() *TaskFlow {
 	return &TaskFlow{
 		OperationContext: &v1alpha1.OperationContext{
 			Name: flowname.SwitchoverTenantsFlow,
@@ -67,7 +67,7 @@ func FlowSwitchoverTenants() *TaskFlow {
 	}
 }
 
-func FlowRevertSwitchoverTenants() *TaskFlow {
+func RevertSwitchoverTenants() *TaskFlow {
 	return &TaskFlow{
 		OperationContext: &v1alpha1.OperationContext{
 			Name: flowname.RevertSwitchoverTenantsFlow,