Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
sophon-zt committed Nov 15, 2024
1 parent 2bdf2f7 commit 9a48472
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion controllers/apps/cluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
}).
Owns(&appsv1.Component{}).
Owns(&corev1.Service{}). // cluster services
Owns(&corev1.Secret{}). // sharding account secret
Owns(&corev1.Secret{}). // sharding account secret
Owns(&dpv1alpha1.BackupPolicy{}).
Owns(&dpv1alpha1.BackupSchedule{}).
Complete(r)
Expand Down
4 changes: 2 additions & 2 deletions controllers/parameters/parameter_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ func classifyParameters(updatedParameters appsv1.ComponentParameters, configmaps
}
}

func validateComponentParameter(parametersDefs []*parametersv1alpha1.ParametersDefinition, descs []parametersv1alpha1.ComponentConfigDescription, paramters map[string]*parametersv1alpha1.ParametersInFile) error {
func validateComponentParameter(parametersDefs []*parametersv1alpha1.ParametersDefinition, descs []parametersv1alpha1.ComponentConfigDescription, parameters map[string]*parametersv1alpha1.ParametersInFile) error {
if len(parametersDefs) == 0 || len(descs) == 0 {
return nil
}
_, err := configctrl.DoMerge(resolveBaseData(paramters), configctrl.DerefMapValues(paramters), parametersDefs, descs)
_, err := configctrl.DoMerge(resolveBaseData(parameters), configctrl.DerefMapValues(parameters), parametersDefs, descs)
return err
}

Expand Down
20 changes: 7 additions & 13 deletions pkg/controller/configuration/configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@ import (
)

const (
compDefName = "test-compdef"
clusterName = "test-cluster"
configTemplateName = "test-config-template"
scriptTemplateName = "test-script-template"
mysqlCompName = "mysql"
mysqlConfigName = "mysql-component-config"
mysqlConfigConstraintName = "mysql8.0-config-constraints"
mysqlScriptsTemplateName = "apecloud-mysql-scripts"
compDefName = "test-compdef"
clusterName = "test-cluster"
configTemplateName = "test-config-template"
scriptTemplateName = "test-script-template"
mysqlCompName = "mysql"
mysqlConfigName = "mysql-component-config"
mysqlScriptsTemplateName = "apecloud-mysql-scripts"
)

func allFieldsCompDefObj(create bool) *appsv1.ComponentDefinition {
Expand Down Expand Up @@ -88,11 +87,6 @@ func newAllFieldsSynthesizedComponent(compDef *appsv1.ComponentDefinition, clust
return synthesizeComp
}

func newAllFieldsComponent(cluster *appsv1.Cluster) *appsv1.Component {
comp, _ := component.BuildComponent(cluster, &cluster.Spec.ComponentSpecs[0], nil, nil)
return comp
}

func addTestVolumeMount(spec *corev1.PodSpec, containerName string) {
for i := range spec.Containers {
container := &spec.Containers[i]
Expand Down

0 comments on commit 9a48472

Please sign in to comment.