Avoid to depend on k8s.io/utils directly

Signed-off-by: Yuki Iwai <[email protected]>
kubeflow · Jul 30, 2023 · 5ca9471 · 5ca9471
1 parent 20a1723
commit 5ca9471
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -30,7 +30,6 @@ require (
 	k8s.io/code-generator v0.25.3
 	k8s.io/klog v1.0.0
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
-	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 	sigs.k8s.io/controller-runtime v0.13.0
 	sigs.k8s.io/yaml v1.3.0
 )
@@ -138,6 +137,7 @@ require (
 	k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
 	k8s.io/klog/v2 v2.70.1 // indirect
 	k8s.io/legacy-cloud-providers v0.21.0 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
diff --git a/pkg/apis/config/v1beta1/defaults_test.go b/pkg/apis/config/v1beta1/defaults_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/utils/pointer"
 
 	commonv1beta1 "github.com/kubeflow/katib/pkg/apis/controller/common/v1beta1"
 )
@@ -203,6 +202,9 @@ func TestSetMetricsCollectorConfigs(t *testing.T) {
 }
 
 func TestSetInitConfig(t *testing.T) {
+	disableGRPCProbeInSuggestion := false
+	customizedWebhookPort := 18443
+
 	cases := map[string]struct {
 		config     InitConfig
 		wantConfig InitConfig
@@ -214,12 +216,12 @@ func TestSetInitConfig(t *testing.T) {
 					MetricsAddr:                 ":8081",
 					HealthzAddr:                 ":18081",
 					InjectSecurityContext:       true,
-					EnableGRPCProbeInSuggestion: pointer.Bool(false),
+					EnableGRPCProbeInSuggestion: &disableGRPCProbeInSuggestion,
 					TrialResources: []string{
 						"Job.v1.batch",
 						"TFJob.v1.kubeflow.org",
 					},
-					WebhookPort:          pointer.Int(18443),
+					WebhookPort:          &customizedWebhookPort,
 					EnableLeaderElection: true,
 					LeaderElectionID:     "xyz0123",
 				},
@@ -230,12 +232,12 @@ func TestSetInitConfig(t *testing.T) {
 					MetricsAddr:                 ":8081",
 					HealthzAddr:                 ":18081",
 					InjectSecurityContext:       true,
-					EnableGRPCProbeInSuggestion: pointer.Bool(false),
+					EnableGRPCProbeInSuggestion: &disableGRPCProbeInSuggestion,
 					TrialResources: []string{
 						"Job.v1.batch",
 						"TFJob.v1.kubeflow.org",
 					},
-					WebhookPort:          pointer.Int(18443),
+					WebhookPort:          &customizedWebhookPort,
 					EnableLeaderElection: true,
 					LeaderElectionID:     "xyz0123",
 				},

diff --git a/pkg/util/v1beta1/katibconfig/config_test.go b/pkg/util/v1beta1/katibconfig/config_test.go
@@ -30,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/yaml"
@@ -368,6 +367,9 @@ func TestGetMetricsCollectorConfigData(t *testing.T) {
 }
 
 func TestGetInitConfigData(t *testing.T) {
+	diableGRPCProbeInSuggestion := false
+	customizedWebhookPort := 18443
+
 	tmpDir, err := os.MkdirTemp("", "temp")
 	if err != nil {
 		t.Fatal(err)
@@ -438,7 +440,7 @@ runtime:
 					MetricsAddr:                 ":8081",
 					HealthzAddr:                 ":18081",
 					InjectSecurityContext:       true,
-					EnableGRPCProbeInSuggestion: pointer.Bool(false),
+					EnableGRPCProbeInSuggestion: &diableGRPCProbeInSuggestion,
 					TrialResources: []string{
 						"Job.v1.batch",
 						"TFJob.v1.kubeflow.org",
@@ -447,7 +449,7 @@ runtime:
 						"XGBoostJob.v1.kubeflow.org",
 						"MXJob.v1.kubeflow.org",
 					},
-					WebhookPort:          pointer.Int(18443),
+					WebhookPort:          &customizedWebhookPort,
 					EnableLeaderElection: true,
 					LeaderElectionID:     "xyz0123",
 				},