Skip to content

Commit 6082093

Browse files
committed
fix validation.go compile error
Signed-off-by: zhangzhengyuan <[email protected]>
1 parent 1b887d6 commit 6082093

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

cmd/app/options/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"time"
55

66
"github.com/spf13/pflag"
7-
"k8s.io/api/core/v1"
7+
v1 "k8s.io/api/core/v1"
88
"k8s.io/apiserver/pkg/apis/config"
99
"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
1010
)
@@ -69,4 +69,4 @@ func (t *TrainingJobOperatorOption) AddFlags(fs *pflag.FlagSet) {
6969
fs.DurationVar(&t.CreatingDurationTime, "creating-duration-period", t.CreatingDurationTime, "The period time of creating container")
7070
fs.BoolVar(&t.EnableCreatingFailed, "enable-creating-failed", t.EnableCreatingFailed, "set job failed if containers have been creating excceed creating-restart-period.")
7171
leaderelectionconfig.BindFlags(&t.LeaderElection, fs)
72-
}
72+
}

pkg/apis/aitrainingjob/validation/validation.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package validation
22

33
import (
44
"fmt"
5+
56
trainingjobv1 "github.com/elasticdeeplearning/trainingjob-operator/pkg/apis/aitrainingjob/v1"
6-
"k8s.io/apimachinery/pkg/runtime"
7+
"k8s.io/klog"
78
)
89

910
// ValidateV1TrainingJobSpec checks that the v1.Trainingjob is valid.
10-
func ValidateV1TrainingJobSpec(job *trainingjobv1.Trainingjob) error {
11-
return validateV1ReplicaSpecs(job.ReplicaSpecs)
11+
func ValidateV1TrainingJobSpec(jobSpec *trainingjobv1.TrainingJobSpec) error {
12+
return validateV1ReplicaSpecs(jobSpec.ReplicaSpecs)
1213
}
1314

1415
func validateV1ReplicaSpecs(specs map[trainingjobv1.ReplicaName]*trainingjobv1.ReplicaSpec) error {
@@ -23,7 +24,7 @@ func validateV1ReplicaSpecs(specs map[trainingjobv1.ReplicaName]*trainingjobv1.R
2324
for _, container := range value.Template.Spec.Containers {
2425
if container.Image == "" {
2526
msg := fmt.Sprintf("Trainingjob is not valid: Image is undefined in the container of %v", rType)
26-
log.Error(msg)
27+
klog.Error(msg)
2728
return fmt.Errorf(msg)
2829
}
2930
}

0 commit comments

Comments
 (0)