Skip to content

Commit b96e1fb

Browse files
authored
Merge pull request #67 from yue9944882/revert/option-validate-hack
Revert "a work-around for unwounding nil panic from bumping k8s dependencies to 1.20
2 parents 6ec7cc3 + f834892 commit b96e1fb

File tree

2 files changed

+1
-49
lines changed

2 files changed

+1
-49
lines changed

internal/sample-apiserver/pkg/cmd/server/hack.go

-47
This file was deleted.

internal/sample-apiserver/pkg/cmd/server/start.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ func NewCommandStartWardleServer(defaults *WardleServerOptions, stopCh <-chan st
8989
// Validate validates WardleServerOptions
9090
func (o WardleServerOptions) Validate(args []string) error {
9191
errors := []error{}
92-
// TODO(1.21): revert this after https://github.com/kubernetes/kubernetes/pull/97954 fixed
93-
errors = append(errors, ValidateRecommendedOptions(o.RecommendedOptions)...)
92+
errors = append(errors, o.RecommendedOptions.Validate()...)
9493
return utilerrors.NewAggregate(errors)
9594
}
9695

0 commit comments

Comments
 (0)