change the module name and import path

.gitignore

@@ -1,6 +1,6 @@
 # go build binaries
 main
-cli-experimental
+cli-utils
 dyctl
 
 #intellij

.travis.yaml

@@ -20,7 +20,7 @@ language: go
 go:
   - "1.12"
 
-go_import_path: sigs.k8s.io/cli-experimental
+go_import_path: sigs.k8s.io/cli-utils
 
 before_install:
   - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.17.1

.travis.yml

@@ -13,7 +13,7 @@ go:
 git:
   depth: 1
 
-go_import_path: sigs.k8s.io/cli-experimental
+go_import_path: sigs.k8s.io/cli-utils
 
 install:
   - go get -u gopkg.in/alecthomas/gometalinter.v2 && gometalinter.v2 --install

Dockerfile

@@ -3,7 +3,7 @@ FROM golang:alpine AS builder
 # Install git
 RUN apk update && apk add --no-cache git
 
-WORKDIR $GOPATH/src/cli-experimental
+WORKDIR $GOPATH/src/cli-utils
 COPY . .
 
 # Install wire

cmd/apply/apply.go

@@ -17,10 +17,10 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/cli-experimental/cmd/apply/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireapply"
+	"sigs.k8s.io/cli-utils/cmd/apply/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireapply"
 )
 
 // GetApplyCommand returns the `apply` cobra Command

cmd/apply/apply_test.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/cli-experimental/cmd/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/cmd/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 var host string
@@ -51,5 +51,5 @@ func TestApply(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
+	assert.Equal(t, "Doing `cli-utils apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
 }

cmd/apply/status/status.go

@@ -19,10 +19,10 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirestatus"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirestatus"
 )
 
 // GetApplyStatusCommand returns a new `apply status` command

cmd/apply/status/status_test.go

@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/cli-experimental/cmd/apply"
-	"sigs.k8s.io/cli-experimental/cmd/apply/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/cmd/apply"
+	"sigs.k8s.io/cli-utils/cmd/apply/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 var host string
@@ -52,7 +52,7 @@ func TestStatusConfigMap(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
+	assert.Equal(t, "Doing `cli-utils apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
 
 	cmd = status.GetApplyStatusCommand(args, false)
 	buf.Reset()
@@ -78,7 +78,7 @@ func TestStatusPod(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental apply`\napplied Pod/myapp-pod\napplied ConfigMap/example-cfgmap\napplied StatefulSet/web\napplied Deployment/frontend\nResources: 4\n", buf.String()) // nolint
+	assert.Equal(t, "Doing `cli-utils apply`\napplied Pod/myapp-pod\napplied ConfigMap/example-cfgmap\napplied StatefulSet/web\napplied Deployment/frontend\nResources: 4\n", buf.String()) // nolint
 
 	cmd = status.GetApplyStatusCommand(args, false)
 	buf.Reset()

cmd/cmd.go

@@ -17,11 +17,11 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/cli-experimental/cmd/apply"
-	"sigs.k8s.io/cli-experimental/cmd/delete"
-	"sigs.k8s.io/cli-experimental/cmd/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/cmd/apply"
+	"sigs.k8s.io/cli-utils/cmd/delete"
+	"sigs.k8s.io/cli-utils/cmd/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -29,7 +29,7 @@ import (
 func Execute(args []string, fn func(*cobra.Command)) error {
 	rootCmd := &cobra.Command{
 		// TODO(Liujingfang1): change this binary to a better name
-		Use:   "cli-experimental",
+		Use:   "cli-utils",
 		Short: "kubectl version 2",
 		Long: `kubectl version 2
 with commands apply, prune, delete and dynamic commands`,

cmd/delete/delete.go

@@ -17,9 +17,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiredelete"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiredelete"
 )
 
 // GetDeleteCommand returns the `prune` cobra Command

cmd/delete/delete_test.go

@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/cli-experimental/cmd/apply"
-	"sigs.k8s.io/cli-experimental/cmd/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/cmd/apply"
+	"sigs.k8s.io/cli-utils/cmd/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 var host string
@@ -52,7 +52,7 @@ func TestDelete(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
+	assert.Equal(t, "Doing `cli-utils apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
 
 	cmd = delete.GetDeleteCommand(args)
 	buf.Reset()
@@ -61,5 +61,5 @@ func TestDelete(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental delete`\nResources: 2\n", buf.String())
+	assert.Equal(t, "Doing `cli-utils delete`\nResources: 2\n", buf.String())
 }

cmd/dy_cmd_test.go

@@ -20,16 +20,16 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/cli-experimental/cmd"
+	"sigs.k8s.io/cli-utils/cmd"
 
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/rest"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
-	dycmd "sigs.k8s.io/cli-experimental/util/dyctl/cmd"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
+	dycmd "sigs.k8s.io/cli-utils/util/dyctl/cmd"
 	"sigs.k8s.io/yaml"
 )
 

cmd/prune/prune.go

@@ -17,9 +17,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireprune"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireprune"
 )
 
 // GetPruneCommand returns the `prune` cobra Command

cmd/prune/prune_test.go

@@ -20,10 +20,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/cli-experimental/cmd/apply"
-	"sigs.k8s.io/cli-experimental/cmd/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/cmd/apply"
+	"sigs.k8s.io/cli-utils/cmd/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 var host string
@@ -52,7 +52,7 @@ func TestPrune(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
+	assert.Equal(t, "Doing `cli-utils apply`\napplied ConfigMap/inventory\napplied ConfigMap/test-map-k6tb869f64\nResources: 2\n", buf.String()) // nolint
 
 	cmd = prune.GetPruneCommand(args)
 	buf.Reset()
@@ -61,5 +61,5 @@ func TestPrune(t *testing.T) {
 	wirek8s.Flags(cmd.PersistentFlags())
 
 	assert.NoError(t, cmd.Execute())
-	assert.Equal(t, "Doing `cli-experimental prune`\nResources: 0\n", buf.String())
+	assert.Equal(t, "Doing `cli-utils prune`\nResources: 0\n", buf.String())
 }

docs/dy/README.md

@@ -23,18 +23,18 @@ kubectl apply -f .sample/cli_v1alpha1_clitestresource.yaml
 
 ### List the Commands from the cli
 
-New `cli-experimental create deployment` Command will now appear in help
+New `cli-utils create deployment` Command will now appear in help
 
 ```bash
-cli-experimental -h
+cli-utils -h
 ```
 
 ```bash
-cli-experimental create -h
+cli-utils create -h
 ```
 
 ```bash
-cli-experimental deployment -h
+cli-utils deployment -h
 ```
 
 ### Run the Command in dry-run
@@ -42,7 +42,7 @@ cli-experimental deployment -h
 Run the command, but print the Resources rather than creating them.
 
 ```bash
-cli-experimental create deployment --image ubuntu --name foo --dry-run
+cli-utils create deployment --image ubuntu --name foo --dry-run
 ```
 
 ### Run the Command
@@ -50,7 +50,7 @@ cli-experimental create deployment --image ubuntu --name foo --dry-run
 Run the command to create the Resources.
 
 ```bash
-cli-experimental create deployment --image ubuntu --name foo
+cli-utils create deployment --image ubuntu --name foo
 ```
 
 ## Publishing a Command
@@ -80,5 +80,5 @@ kubectl apply -f path/to/crd.yaml
 ### Run the new Command
 
 ```bash
-cli-experimental your command -h
+cli-utils your command -h
 ```

docs/dy/sample/cli_v1alpha1_clitestresource.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cli-experimental.sigs.k8s.io/ResourceCommandList: '{"items":[{"command":{"aliases":["deploy","deployments"],"example":"#
+    cli-utils.sigs.k8s.io/ResourceCommandList: '{"items":[{"command":{"aliases":["deploy","deployments"],"example":"#
       Create a new deployment named my-dep that runs the busybox image.\nkubectl create
       deployment --name my-dep --image=busybox\n","flags":[{"description":"deployment
       name","name":"name","type":"String"},{"description":"Image name to run.","name":"image","type":"String"},{"description":"Image
@@ -17,7 +17,7 @@ metadata:
       {{index .Flags.Strings \"name\"}}\n    spec:\n      containers:\n      - name:
       {{index .Flags.Strings \"name\"}}\n        image: {{index .Flags.Strings \"image\"}}\n","group":"apps","operation":"Create","resource":"deployments","saveResponseValues":[{"jsonPath":"{.metadata.name}","name":"responsename"}],"version":"v1"}]}]}'
   labels:
-    cli-experimental.sigs.k8s.io/ResourceCommandList: ""
+    cli-utils.sigs.k8s.io/ResourceCommandList: ""
   name: clitestresources.test.cli.sigs.k8s.io
 spec:
   group: test.cli.sigs.k8s.io

go.mod

@@ -1,4 +1,4 @@
-module sigs.k8s.io/cli-experimental
+module sigs.k8s.io/cli-utils
 
 go 1.12
 

internal/pkg/apply/apply.go

@@ -18,14 +18,14 @@ import (
 	"fmt"
 	"io"
 	"k8s.io/apimachinery/pkg/api/errors"
-	"sigs.k8s.io/cli-experimental/internal/pkg/constants"
+	"sigs.k8s.io/cli-utils/internal/pkg/constants"
 
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 	"sigs.k8s.io/kustomize/pkg/inventory"
 )
 
@@ -52,7 +52,7 @@ type Result struct {
 
 // Do executes the apply
 func (a *Apply) Do() (Result, error) {
-	fmt.Fprintf(a.Out, "Doing `cli-experimental apply`\n")
+	fmt.Fprintf(a.Out, "Doing `cli-utils apply`\n")
 
 	// TODO(Liuijngfang1): add a dry-run for all objects
 	// When the dry-run passes, proceed to the actual apply

internal/pkg/apply/apply_test.go

@@ -19,16 +19,16 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/cli-experimental/internal/pkg/constants"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/constants"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 func TestApplyEmpty(t *testing.T) {

internal/pkg/client/client.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client/patch"
+	"sigs.k8s.io/cli-utils/internal/pkg/client/patch"
 )
 
 // NewForConfig returns a new Client using the provided config and Options.

internal/pkg/client/client_test.go

@@ -33,8 +33,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	kscheme "k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client/patch"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	"sigs.k8s.io/cli-utils/internal/pkg/client/patch"
 )
 
 const serverSideTimeoutSeconds = 10

internal/pkg/client/interface.go

@@ -19,7 +19,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client/patch"
+	"sigs.k8s.io/cli-utils/internal/pkg/client/patch"
 )
 
 // Reader knows how to read and list Kubernetes objects.

internal/pkg/client/patch/patch_test.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	kscheme "k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client/patch"
+	"sigs.k8s.io/cli-utils/internal/pkg/client/patch"
 )
 
 var _ = Describe("Patch", func() {

internal/pkg/client/unstructured/helpers_test.go

@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	helperu "sigs.k8s.io/cli-experimental/internal/pkg/client/unstructured"
+	helperu "sigs.k8s.io/cli-utils/internal/pkg/client/unstructured"
 )
 
 var testObj = map[string]interface{}{

internal/pkg/delete/delete.go

@@ -18,13 +18,13 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
 	"sigs.k8s.io/kustomize/pkg/inventory"
 )
 
@@ -51,7 +51,7 @@ type Result struct {
 
 // Do executes the delete
 func (a *Delete) Do() (Result, error) {
-	fmt.Fprintf(a.Out, "Doing `cli-experimental delete`\n")
+	fmt.Fprintf(a.Out, "Doing `cli-utils delete`\n")
 	ctx := context.Background()
 	for _, u := range normalizeResourceOrdering(a.Resources) {
 		annotations := u.GetAnnotations()

internal/pkg/delete/delete_test.go

@@ -19,16 +19,16 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 func TestDeleteEmpty(t *testing.T) {

internal/pkg/dy/dispatch/dispatch.go

@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/util/jsonpath"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/output"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/output"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
 	"sigs.k8s.io/yaml"
 )
 

internal/pkg/dy/dispatch/dispatch_test.go

@@ -22,16 +22,16 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/dispatch"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/dispatch"
 
 	v1 "k8s.io/api/apps/v1"
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 	"sigs.k8s.io/yaml"
 )
 

internal/pkg/dy/dy.go

@@ -21,11 +21,11 @@ import (
 	"github.com/spf13/cobra"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/dispatch"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/list"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/output"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/dispatch"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/list"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/output"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
 )
 
 // ProviderSet provides wiring for initializing types.

internal/pkg/dy/dy_test.go

@@ -26,10 +26,10 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
-	"sigs.k8s.io/cli-experimental/util/dyctl/cmd"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/util/dyctl/cmd"
 	"sigs.k8s.io/yaml"
 )
 

internal/pkg/dy/list/list.go

@@ -25,12 +25,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
-	clidynamic "sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
+	clidynamic "sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
 	"sigs.k8s.io/yaml"
 )
 
 const (
-	annotation = "cli-experimental.sigs.k8s.io/ResourceCommandList"
+	annotation = "cli-utils.sigs.k8s.io/ResourceCommandList"
 	label      = annotation
 )
 

internal/pkg/dy/output/output.go

@@ -22,8 +22,8 @@ import (
 	"io"
 	"text/template"
 
-	clidynamic "sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
+	clidynamic "sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
 )
 
 // CommandOutputWriter writes command Response values

internal/pkg/dy/parse/parse.go

@@ -18,7 +18,7 @@ package parse
 
 import (
 	"github.com/spf13/cobra"
-	clidynamic "sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
+	clidynamic "sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
 )
 
 // CommandParser parses clidnamic.Commands into cobra.Commands

internal/pkg/dy/parse/parse_test.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
 )
 
 func TestParseDryRunFlag(t *testing.T) {

internal/pkg/dy/wire.go

@@ -19,8 +19,8 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli"
 )
 
 // InitializeCommandLister creates a new *CommandLister object

internal/pkg/dy/wire_gen.go

@@ -7,12 +7,12 @@ package dy
 
 import (
 	"io"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/dispatch"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/list"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/output"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/dispatch"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/list"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/output"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Injectors from wire.go:

internal/pkg/prune/prune.go

@@ -24,10 +24,10 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/constants"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/constants"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 	"sigs.k8s.io/kustomize/pkg/inventory"
 )
 
@@ -59,7 +59,7 @@ func (o *Prune) Do() (Result, error) {
 	if o.Resources == nil {
 		return Result{}, nil
 	}
-	fmt.Fprintf(o.Out, "Doing `cli-experimental prune`\n")
+	fmt.Fprintf(o.Out, "Doing `cli-utils prune`\n")
 	ctx := context.Background()
 
 	u, found, err := o.findInventoryObject()

internal/pkg/prune/prune_test.go

@@ -25,9 +25,9 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 func TestPruneEmpty(t *testing.T) {

internal/pkg/resourceconfig/resourceconfig.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
 	"sigs.k8s.io/kustomize/pkg/fs"
 	"sigs.k8s.io/kustomize/pkg/ifc"
 	"sigs.k8s.io/kustomize/pkg/ifc/transformer"

internal/pkg/resourceconfig/resourceconfig_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 	"sigs.k8s.io/kustomize/pkg/inventory"
 	"sigs.k8s.io/yaml"
 )

internal/pkg/status/generic_status.go

@@ -15,7 +15,7 @@ package status
 
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	clientu "sigs.k8s.io/cli-experimental/internal/pkg/client/unstructured"
+	clientu "sigs.k8s.io/cli-utils/internal/pkg/client/unstructured"
 )
 
 // readyConditionReader reads Ready condition from the unstructured object

internal/pkg/status/legacy_status.go

@@ -16,7 +16,7 @@ package status
 import (
 	"fmt"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	clientu "sigs.k8s.io/cli-experimental/internal/pkg/client/unstructured"
+	clientu "sigs.k8s.io/cli-utils/internal/pkg/client/unstructured"
 )
 
 // GetConditionsFn status getter

internal/pkg/status/status.go

@@ -23,9 +23,9 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	clientu "sigs.k8s.io/cli-experimental/internal/pkg/client/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	clientu "sigs.k8s.io/cli-utils/internal/pkg/client/unstructured"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
 )
 
 // Condition types

internal/pkg/status/status_test.go

@@ -21,9 +21,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 func noitems() clik8s.ResourceConfigs {

internal/pkg/util/client_util.go

@@ -10,8 +10,8 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	"sigs.k8s.io/cli-experimental/internal/pkg/constants"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	"sigs.k8s.io/cli-utils/internal/pkg/constants"
 )
 
 // DeleteObject delete an object given a client and Group,Version,Kind,Name,Namespace of an object

internal/pkg/wirecli/wireapply/wire.go

@@ -19,9 +19,9 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 )
 
 // InitializeApply creates a new *apply.Apply object

internal/pkg/wirecli/wireapply/wire_gen.go

@@ -7,12 +7,12 @@ package wireapply
 
 import (
 	"io"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Injectors from wire.go:

internal/pkg/wirecli/wireapply/wireapply.go

@@ -18,10 +18,10 @@ import (
 
 	"github.com/google/wire"
 
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // ProviderSet defines dependencies for initializing objects

internal/pkg/wirecli/wirecli.go

@@ -15,9 +15,9 @@ package wirecli
 
 import (
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // ProviderSet defines dependencies for initializing objects

internal/pkg/wirecli/wireconfig/wireconfig.go

@@ -16,8 +16,8 @@ package wireconfig
 import (
 	"github.com/google/wire"
 
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/resourceconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
 	"sigs.k8s.io/kustomize/k8sdeps/kunstruct"
 	ktransformer "sigs.k8s.io/kustomize/k8sdeps/transformer"
 	"sigs.k8s.io/kustomize/pkg/fs"

internal/pkg/wirecli/wiredelete/wire.go

@@ -18,11 +18,11 @@ package wiredelete
 import (
 	"io"
 
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
 )
 
 // DoDelete creates a new Delete object and runs it

internal/pkg/wirecli/wiredelete/wire_gen.go

@@ -7,12 +7,12 @@ package wiredelete
 
 import (
 	"io"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	delete2 "sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	delete2 "sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Injectors from wire.go:

internal/pkg/wirecli/wiredelete/wiredelete.go

@@ -17,10 +17,10 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // ProviderSet defines dependencies for initializing objects

internal/pkg/wirecli/wiregit/wiregit.go

@@ -4,7 +4,7 @@ import (
 	"github.com/google/wire"
 	gogit "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
 )
 
 // OptionalProviderSet provides optional Git dependencies.

internal/pkg/wirecli/wirek8s/wirek8s.go

@@ -23,9 +23,9 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	"sigs.k8s.io/cli-experimental/internal/pkg/client"
-	"sigs.k8s.io/cli-experimental/internal/pkg/configflags"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/client"
+	"sigs.k8s.io/cli-utils/internal/pkg/configflags"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
 	// for connecting to various types of hosted clusters

internal/pkg/wirecli/wireprune/wire.go

@@ -18,11 +18,11 @@ package wireprune
 import (
 	"io"
 
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
 )
 
 // DoPrune creates a new Prune object and runs it

internal/pkg/wirecli/wireprune/wire_gen.go

@@ -7,12 +7,12 @@ package wireprune
 
 import (
 	"io"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Injectors from wire.go:

internal/pkg/wirecli/wireprune/wireprune.go

@@ -17,10 +17,10 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // ProviderSet defines dependencies for initializing objects

internal/pkg/wirecli/wirestatus/wire.go

@@ -19,9 +19,9 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 )
 
 // InitializeStatus creates a new *status.Status object

internal/pkg/wirecli/wirestatus/wire_gen.go

@@ -7,12 +7,12 @@ package wirestatus
 
 import (
 	"io"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Injectors from wire.go:

internal/pkg/wirecli/wirestatus/wirestatus.go

@@ -17,10 +17,10 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiregit"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // ProviderSet defines dependencies for initializing objects

internal/pkg/wirecli/wiretest/wire.go

@@ -23,16 +23,16 @@ import (
 
 	"github.com/google/wire"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/dispatch"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/list"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/resourceconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/dispatch"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/list"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
 )
 
 func InitializeStatus(clik8s.ResourceConfigs, *object.Commit, io.Writer) (*status.Status, func(), error) {

internal/pkg/wirecli/wiretest/wire_gen.go

@@ -11,19 +11,19 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/clik8s"
-	delete2 "sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/dispatch"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/list"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/output"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy/parse"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/resourceconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wireconfig"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
+	delete2 "sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/dispatch"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/list"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/output"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy/parse"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 )
 
 // Injectors from wire.go:

internal/pkg/wirecli/wiretest/wiretest.go

@@ -16,12 +16,12 @@ package wiretest
 import (
 	"github.com/google/wire"
 	"k8s.io/client-go/rest"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/dy"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/dy"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 )
 

main.go

@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"os"
 
-	"sigs.k8s.io/cli-experimental/cmd"
+	"sigs.k8s.io/cli-utils/cmd"
 )
 
 func main() {

pkg/cmd.go

@@ -15,10 +15,10 @@ package pkg
 
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
 )
 
 // TODO

pkg/doc.go

@@ -12,6 +12,6 @@ limitations under the License.
 */
 
 /*
-Package pkg contains public libraries for building tools on top of cli-experimental.
+Package pkg contains public libraries for building tools on top of cli-utils.
 */
 package pkg

pkg/wire.go

@@ -19,7 +19,7 @@ import (
 	"io"
 
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
 )
 
 // InitializeCmd creates a new Cmd object

pkg/wire_gen.go

@@ -7,13 +7,13 @@ package pkg
 
 import (
 	"io"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	delete2 "sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/util"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	delete2 "sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/util"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 // Injectors from wire.go:

pkg/wirepkg.go

@@ -15,12 +15,12 @@ package pkg
 
 import (
 	"github.com/google/wire"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apply"
-	"sigs.k8s.io/cli-experimental/internal/pkg/delete"
-	"sigs.k8s.io/cli-experimental/internal/pkg/prune"
-	"sigs.k8s.io/cli-experimental/internal/pkg/status"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wirek8s"
-	"sigs.k8s.io/cli-experimental/internal/pkg/wirecli/wiretest"
+	"sigs.k8s.io/cli-utils/internal/pkg/apply"
+	"sigs.k8s.io/cli-utils/internal/pkg/delete"
+	"sigs.k8s.io/cli-utils/internal/pkg/prune"
+	"sigs.k8s.io/cli-utils/internal/pkg/status"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wirek8s"
+	"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiretest"
 )
 
 // ProviderSet provides the dependencies for creating a Cmd object

scripts/manual-test.sh

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 set -e
-./cli-experimental --kubeconfig ~/.kube/config apply cmd/test-manifests/hello
-./cli-experimental --kubeconfig ~/.kube/config apply status cmd/test-manifests/hello --wait --every 2 --count 30
-./cli-experimental --kubeconfig ~/.kube/config delete cmd/test-manifests/hello
-./cli-experimental --kubeconfig ~/.kube/config apply status cmd/test-manifests/hello
+./cli-utils --kubeconfig ~/.kube/config apply cmd/test-manifests/hello
+./cli-utils --kubeconfig ~/.kube/config apply status cmd/test-manifests/hello --wait --every 2 --count 30
+./cli-utils --kubeconfig ~/.kube/config delete cmd/test-manifests/hello
+./cli-utils --kubeconfig ~/.kube/config apply status cmd/test-manifests/hello

util/dyctl/cmd/add.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/cli-experimental/internal/pkg/apis/dynamic/v1alpha1"
+	"sigs.k8s.io/cli-utils/internal/pkg/apis/dynamic/v1alpha1"
 	"sigs.k8s.io/yaml"
 )
 
@@ -91,7 +91,7 @@ func AddTo(commandList *v1alpha1.ResourceCommandList, crd v1.Object) error {
 	if lab == nil {
 		lab = map[string]string{}
 	}
-	lab["cli-experimental.sigs.k8s.io/ResourceCommandList"] = ""
+	lab["cli-utils.sigs.k8s.io/ResourceCommandList"] = ""
 	crd.SetLabels(lab)
 
 	// Add the Annotation
@@ -113,7 +113,7 @@ func AddTo(commandList *v1alpha1.ResourceCommandList, crd v1.Object) error {
 	if an == nil {
 		an = map[string]string{}
 	}
-	an["cli-experimental.sigs.k8s.io/ResourceCommandList"] = string(clAnn.String())
+	an["cli-utils.sigs.k8s.io/ResourceCommandList"] = string(clAnn.String())
 	crd.SetAnnotations(an)
 	return nil
 }

util/dyctl/main.go

@@ -13,7 +13,7 @@ limitations under the License.
 
 package main
 
-import "sigs.k8s.io/cli-experimental/util/dyctl/cmd"
+import "sigs.k8s.io/cli-utils/util/dyctl/cmd"
 
 func main() {
 	cmd.Execute()