update kubectl to 1.18.10

Author: Liujingfang1

cmd/diff/cmddiff.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/klog"
-	"k8s.io/kubectl/pkg/cmd/apply"
 	"k8s.io/kubectl/pkg/cmd/diff"
 	"k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
@@ -90,10 +90,7 @@ func Initialize(o *diff.DiffOptions, f util.Factory, args []string) (func(), err
 		return cleanupFunc, err
 	}
 
-	o.DryRunVerifier = &apply.DryRunVerifier{
-		Finder:        util.NewCRDFinder(util.CRDFromDynamic(o.DynamicClient)),
-		OpenAPIGetter: o.DiscoveryClient,
-	}
+	o.DryRunVerifier = resource.NewDryRunVerifier(o.DynamicClient, o.DiscoveryClient)
 
 	o.CmdNamespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
 	if err != nil {

go.mod

@@ -20,15 +20,15 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.17.2
-	k8s.io/apiextensions-apiserver v0.17.2
-	k8s.io/apimachinery v0.17.2
-	k8s.io/cli-runtime v0.17.2
-	k8s.io/client-go v0.17.2
+	k8s.io/api v0.18.10
+	k8s.io/apiextensions-apiserver v0.18.10
+	k8s.io/apimachinery v0.18.10
+	k8s.io/cli-runtime v0.18.10
+	k8s.io/client-go v0.18.10
 	k8s.io/klog v1.0.0
-	k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
-	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
-	sigs.k8s.io/controller-runtime v0.4.0
+	k8s.io/kubectl v0.18.10
+	k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
+	sigs.k8s.io/controller-runtime v0.6.0
 	sigs.k8s.io/kustomize/kyaml v0.9.3
 	sigs.k8s.io/yaml v1.2.0
 )

go.sum

@@ -12,6 +12,7 @@
 package prune
 
 import (
+	"context"
 	"sort"
 	"strings"
 
@@ -107,7 +108,7 @@ func (po *PruneOptions) Prune(localInv *unstructured.Unstructured, localObjs []*
 			return err
 		}
 		namespacedClient := po.client.Resource(mapping.Resource).Namespace(clusterObj.Namespace)
-		obj, err := namespacedClient.Get(clusterObj.Name, metav1.GetOptions{})
+		obj, err := namespacedClient.Get(context.TODO(), clusterObj.Name, metav1.GetOptions{})
 		if err != nil {
 			// Object not found in cluster, so no need to delete it; skip to next object.
 			if apierrors.IsNotFound(err) {
@@ -146,7 +147,7 @@ func (po *PruneOptions) Prune(localInv *unstructured.Unstructured, localObjs []*
 		}
 		if !o.DryRunStrategy.ClientOrServerDryRun() {
 			klog.V(4).Infof("prune object delete: %s/%s", clusterObj.Namespace, clusterObj.Name)
-			err = namespacedClient.Delete(clusterObj.Name, &metav1.DeleteOptions{})
+			err = namespacedClient.Delete(context.TODO(), clusterObj.Name, metav1.DeleteOptions{})
 			if err != nil {
 				return err
 			}

pkg/apply/prune/prune.go

@@ -178,13 +178,12 @@ func newApplyOptions(eventChannel chan event.Event, serverSideOptions common.Ser
 		ServerSideApply: strategy.ServerDryRun() || serverSideOptions.ServerSideApply,
 		ForceConflicts:  serverSideOptions.ForceConflicts,
 		FieldManager:    serverSideOptions.FieldManager,
-		DryRun:          strategy.ClientOrServerDryRun(),
-		ServerDryRun:    strategy.ServerDryRun(),
+		DryRunStrategy:  strategy.Strategy(),
 		ToPrinter: (&KubectlPrinterAdapter{
 			ch: eventChannel,
 		}).toPrinterFunc(),
-		DiscoveryClient: discovery,
-		DynamicClient:   dynamic,
+		DynamicClient:  dynamic,
+		DryRunVerifier: resource.NewDryRunVerifier(dynamic, discovery),
 	}, nil
 }
 

pkg/apply/task/apply_task.go

@@ -6,6 +6,8 @@ package common
 import (
 	"fmt"
 	"math/rand"
+
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 )
 
 const (
@@ -102,6 +104,18 @@ func (drs DryRunStrategy) ClientOrServerDryRun() bool {
 	return drs == DryRunClient || drs == DryRunServer
 }
 
+// Strategy returns the
+func (drs DryRunStrategy) Strategy() cmdutil.DryRunStrategy {
+	switch drs {
+	case DryRunClient:
+		return cmdutil.DryRunClient
+	case DryRunServer:
+		return cmdutil.DryRunServer
+	default:
+		return cmdutil.DryRunNone
+	}
+}
+
 // ServerSideOptions encapsulates the fields to implement server-side apply.
 type ServerSideOptions struct {
 	// ServerSideApply means the merge patch is calculated on the API server instead of the client.

pkg/common/common.go

@@ -351,7 +351,7 @@ func (cic *ClusterInventoryClient) createInventoryObj(obj *unstructured.Unstruct
 	}
 	klog.V(4).Infof("creating inventory object: %s/%s", invInfo.Namespace, invInfo.Name)
 	var clearResourceVersion = false
-	createdObj, err := helper.Create(invInfo.Namespace, clearResourceVersion, invInfo.Object, nil)
+	createdObj, err := helper.Create(invInfo.Namespace, clearResourceVersion, invInfo.Object)
 	if err != nil {
 		return err
 	}
@@ -408,7 +408,7 @@ func (cic *ClusterInventoryClient) ApplyInventoryNamespace(obj *unstructured.Uns
 		return err
 	}
 	var clearResourceVersion = false
-	createdObj, err := helper.Create(invInfo.Namespace, clearResourceVersion, invInfo.Object, nil)
+	createdObj, err := helper.Create(invInfo.Namespace, clearResourceVersion, invInfo.Object)
 	if err != nil {
 		if !apierrors.IsAlreadyExists(err) {
 			return err