Make it compile with 1.14.1

Author: sttts

main.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/klog"
 
 	genericapiserver "k8s.io/apiserver/pkg/server"
-	"k8s.io/apiserver/pkg/util/logs"
+	"k8s.io/component-base/logs"
 
 	"github.com/programming-kubernetes/custom-apiserver/pkg/cmd/server"
 

pkg/cmd/server/start.go

@@ -31,8 +31,8 @@ import (
 	"github.com/programming-kubernetes/custom-apiserver/pkg/admission/custominitializer"
 	"github.com/programming-kubernetes/custom-apiserver/pkg/apis/restaurant/v1alpha1"
 	"github.com/programming-kubernetes/custom-apiserver/pkg/apiserver"
-	clientset "github.com/programming-kubernetes/custom-apiserver/pkg/generated/clientset/internalversion"
-	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/internalversion"
+	clientset "github.com/programming-kubernetes/custom-apiserver/pkg/generated/clientset/versioned"
+	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/externalversions"
 )
 
 const defaultEtcdPathPrefix = "/registry/custom-apiserver.programming-kubernetes.info"
@@ -115,7 +115,7 @@ func (o *CustomServerOptions) Config() (*apiserver.Config, error) {
 	}
 
 	serverConfig := genericapiserver.NewRecommendedConfig(apiserver.Codecs)
-	if err := o.RecommendedOptions.ApplyTo(serverConfig, apiserver.Scheme); err != nil {
+	if err := o.RecommendedOptions.ApplyTo(serverConfig); err != nil {
 		return nil, err
 	}
 

pkg/registry/restaurant/pizza/strategy.go

@@ -39,12 +39,12 @@ func NewStrategy(typer runtime.ObjectTyper) pizzaStrategy {
 
 // GetAttrs returns labels.Set, fields.Set, the presence of Initializers if any
 // and error in case the given runtime.Object is not a Pizza
-func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) {
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
 	apiserver, ok := obj.(*restaurant.Pizza)
 	if !ok {
-		return nil, nil, false, fmt.Errorf("given object is not a Pizza")
+		return nil, nil, fmt.Errorf("given object is not a Pizza")
 	}
-	return labels.Set(apiserver.ObjectMeta.Labels), SelectableFields(apiserver), apiserver.Initializers != nil, nil
+	return labels.Set(apiserver.ObjectMeta.Labels), SelectableFields(apiserver), nil
 }
 
 // MatchPizza is the filter used by the generic etcd backend to watch events

pkg/registry/restaurant/topping/strategy.go

@@ -38,12 +38,12 @@ func NewStrategy(typer runtime.ObjectTyper) toppingStrategy {
 
 // GetAttrs returns labels.Set, fields.Set, the presence of Initializers if any
 // and error in case the given runtime.Object is not a Topping
-func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) {
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
 	apiserver, ok := obj.(*restaurant.Topping)
 	if !ok {
-		return nil, nil, false, fmt.Errorf("given object is not a Topping")
+		return nil, nil, fmt.Errorf("given object is not a Topping")
 	}
-	return labels.Set(apiserver.ObjectMeta.Labels), SelectableFields(apiserver), apiserver.Initializers != nil, nil
+	return labels.Set(apiserver.ObjectMeta.Labels), SelectableFields(apiserver), nil
 }
 
 // MatchTopping is the filter used by the generic etcd backend to watch events