Don't use pointers for string.

Author: AMecea

pkg/apis/mysql/v1alpha1/cluster.go

@@ -287,25 +287,21 @@ func (ql *QueryLimits) GetOptions() []string {
 		"--busy-time", fmt.Sprintf("%d", ql.MaxQueryTime),
 	}
 
-	if ql.KillMode != nil {
-		switch *ql.KillMode {
-		case "connection":
-			options = append(options, "--kill")
-		case "query":
-			options = append(options, "--kill-query")
-		default:
-			options = append(options, "--kill-query")
-		}
-	} else {
+	switch ql.KillMode {
+	case "connection":
+		options = append(options, "--kill")
+	case "query":
+		options = append(options, "--kill-query")
+	default:
 		options = append(options, "--kill-query")
 	}
 
 	if ql.MaxIdleTime != nil {
 		options = append(options, "--idle-time", fmt.Sprintf("%d", *ql.MaxIdleTime))
 	}
 
-	if ql.Kill != nil {
-		options = append(options, "--victims", *ql.Kill)
+	if len(ql.Kill) != 0 {
+		options = append(options, "--victims", ql.Kill)
 	}
 
 	if len(ql.IgnoreDb) > 0 {

pkg/apis/mysql/v1alpha1/types.go

@@ -182,14 +182,14 @@ type QueryLimits struct {
 	// By default, the matching query with the highest Time value is killed (the
 	// oldest query.
 	// +optional
-	Kill *string `json:"kill,omitempty"`
+	Kill string `json:"kill,omitempty"`
 
 	// KillMode can be: `connection` or `query`, when it's used `connection`
 	// means that when a query is matched the connection is killed (using --kill
 	// flag) and if it's used `query` means that the query is killed (using
 	// --kill-query flag)
 	// +optional
-	KillMode *string `json:"killMode,omitempty"`
+	KillMode string `json:"killMode,omitempty"`
 
 	// IgnoreDb is the list of database that are ignored by pt-kill (--ignore-db
 	// flag).

pkg/apis/mysql/v1alpha1/zz_generated.deepcopy.go

@@ -393,24 +393,6 @@ func (in *QueryLimits) DeepCopyInto(out *QueryLimits) {
 			**out = **in
 		}
 	}
-	if in.Kill != nil {
-		in, out := &in.Kill, &out.Kill
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(string)
-			**out = **in
-		}
-	}
-	if in.KillMode != nil {
-		in, out := &in.KillMode, &out.KillMode
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(string)
-			**out = **in
-		}
-	}
 	if in.IgnoreDb != nil {
 		in, out := &in.IgnoreDb, &out.IgnoreDb
 		*out = make([]string, len(*in))