allow importing the ctl cmd package

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
cert-manager · May 12, 2023 · a44b2d5 · a44b2d5
1 parent 4f7a2a4
commit a44b2d5
Show file tree

Hide file tree

Showing 39 changed files with 68 additions and 68 deletions.
diff --git a/cmd/ctl/LICENSES b/cmd/ctl/LICENSES
@@ -9,7 +9,7 @@ github.com/asaskevich/govalidator,https://github.com/asaskevich/govalidator/blob
 github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LICENSE,MIT
 github.com/blang/semver/v4,https://github.com/blang/semver/blob/v4.0.0/v4/LICENSE,MIT
 github.com/cert-manager/cert-manager,https://github.com/cert-manager/cert-manager/blob/HEAD/LICENSE,Apache-2.0
-github.com/cert-manager/cert-manager/cmctl-binary,https://github.com/cert-manager/cert-manager/blob/HEAD/cmctl-binary/LICENSE,Apache-2.0
+github.com/cert-manager/cert-manager/cmd/ctl,https://github.com/cert-manager/cert-manager/blob/HEAD/cmctl-binary/LICENSE,Apache-2.0
 github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.2.0/LICENSE.txt,MIT
 github.com/chai2010/gettext-go,https://github.com/chai2010/gettext-go/blob/v1.0.2/LICENSE,BSD-3-Clause
 github.com/containerd/containerd,https://github.com/containerd/containerd/blob/v1.7.0/LICENSE,Apache-2.0

diff --git a/cmd/ctl/cmd/cmd.go b/cmd/ctl/cmd/cmd.go
@@ -27,8 +27,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/klog/v2"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build/commands"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands"
 )
 
 func NewCertManagerCtlCommand(ctx context.Context, in io.Reader, out, err io.Writer) *cobra.Command {

diff --git a/cmd/ctl/go.mod b/cmd/ctl/go.mod
@@ -1,4 +1,4 @@
-module github.com/cert-manager/cert-manager/cmctl-binary
+module github.com/cert-manager/cert-manager/cmd/ctl
 
 go 1.20
 

diff --git a/cmd/ctl/main.go b/cmd/ctl/main.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	ctlcmd "github.com/cert-manager/cert-manager/cmctl-binary/cmd"
+	ctlcmd "github.com/cert-manager/cert-manager/cmd/ctl/cmd"
 	"github.com/cert-manager/cert-manager/internal/cmd/util"
 )
 

diff --git a/cmd/ctl/pkg/approve/approve.go b/cmd/ctl/pkg/approve/approve.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"

diff --git a/cmd/ctl/pkg/build/commands/commands.go b/cmd/ctl/pkg/build/commands/commands.go
@@ -23,18 +23,18 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/approve"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/check"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/completion"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/convert"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/create"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/deny"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/experimental"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/inspect"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/renew"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/status"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/upgrade"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/version"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/approve"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/check"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/completion"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/convert"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/create"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/deny"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/experimental"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/inspect"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/renew"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/status"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/upgrade"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/version"
 )
 
 // registerCompletion gates whether the completion command is registered.

diff --git a/cmd/ctl/pkg/check/api/api.go b/cmd/ctl/pkg/check/api/api.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	cmcmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/pkg/util/cmapichecker"
 )

diff --git a/cmd/ctl/pkg/check/check.go b/cmd/ctl/pkg/check/check.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/check/api"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/check/api"
 )
 
 // NewCmdCheck returns a cobra command for checking cert-manager components.

diff --git a/cmd/ctl/pkg/completion/bash.go b/cmd/ctl/pkg/completion/bash.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/cmd/util"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
 )
 
 func newCmdCompletionBash(ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/completion/fish.go b/cmd/ctl/pkg/completion/fish.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/cmd/util"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
 )
 
 func newCmdCompletionFish(ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/completion/powershell.go b/cmd/ctl/pkg/completion/powershell.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/cmd/util"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
 )
 
 func newCmdCompletionPowerShell(ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/completion/zsh.go b/cmd/ctl/pkg/completion/zsh.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/cmd/util"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
 )
 
 func newCmdCompletionZSH(ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/convert/convert.go b/cmd/ctl/pkg/convert/convert.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
 
 	"github.com/spf13/cobra"

diff --git a/cmd/ctl/pkg/create/certificaterequest/certificaterequest.go b/cmd/ctl/pkg/create/certificaterequest/certificaterequest.go
@@ -35,8 +35,8 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"

diff --git a/cmd/ctl/pkg/create/certificaterequest/certificaterequest_test.go b/cmd/ctl/pkg/create/certificaterequest/certificaterequest_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 )
 
 func TestValidate(t *testing.T) {

diff --git a/cmd/ctl/pkg/create/certificatesigningrequest/certificatesigningrequest.go b/cmd/ctl/pkg/create/certificatesigningrequest/certificatesigningrequest.go
@@ -39,8 +39,8 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	"github.com/cert-manager/cert-manager/pkg/apis/certmanager"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"

diff --git a/cmd/ctl/pkg/create/create.go b/cmd/ctl/pkg/create/create.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/create/certificaterequest"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/create/certificaterequest"
 )
 
 func NewCmdCreate(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/deny/deny.go b/cmd/ctl/pkg/deny/deny.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"

diff --git a/cmd/ctl/pkg/experimental/experimental.go b/cmd/ctl/pkg/experimental/experimental.go
@@ -22,10 +22,10 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/create"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/create/certificatesigningrequest"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/install"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/uninstall"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/create"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/create/certificatesigningrequest"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/install"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/uninstall"
 )
 
 func NewCmdExperimental(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/inspect/inspect.go b/cmd/ctl/pkg/inspect/inspect.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/inspect/secret"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/inspect/secret"
 )
 
 func NewCmdInspect(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/inspect/secret/secret.go b/cmd/ctl/pkg/inspect/secret/secret.go
@@ -36,8 +36,8 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 	k8sclock "k8s.io/utils/clock"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	"github.com/cert-manager/cert-manager/pkg/util/pki"
 )

diff --git a/cmd/ctl/pkg/install/install.go b/cmd/ctl/pkg/install/install.go
@@ -36,8 +36,8 @@ import (
 	"helm.sh/helm/v3/pkg/release"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/install/helm"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/install/helm"
 )
 
 type InstallOptions struct {

diff --git a/cmd/ctl/pkg/renew/renew.go b/cmd/ctl/pkg/renew/renew.go
@@ -30,8 +30,8 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"

diff --git a/cmd/ctl/pkg/status/certificate/certificate.go b/cmd/ctl/pkg/status/certificate/certificate.go
@@ -32,8 +32,8 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"

diff --git a/cmd/ctl/pkg/status/certificate/types.go b/cmd/ctl/pkg/status/certificate/types.go
@@ -28,7 +28,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubectl/pkg/describe"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/status/util"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/status/util"
 	cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	"github.com/cert-manager/cert-manager/pkg/util/pki"

diff --git a/cmd/ctl/pkg/status/status.go b/cmd/ctl/pkg/status/status.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/status/certificate"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/status/certificate"
 )
 
 func NewCmdStatus(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/uninstall/uninstall.go b/cmd/ctl/pkg/uninstall/uninstall.go
@@ -31,7 +31,7 @@ import (
 	"helm.sh/helm/v3/pkg/storage/driver"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
 )
 
 type options struct {

diff --git a/cmd/ctl/pkg/upgrade/migrateapiversion/command.go b/cmd/ctl/pkg/upgrade/migrateapiversion/command.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	acmeinstall "github.com/cert-manager/cert-manager/internal/apis/acme/install"
 	cminstall "github.com/cert-manager/cert-manager/internal/apis/certmanager/install"
 )

diff --git a/cmd/ctl/pkg/upgrade/upgrade.go b/cmd/ctl/pkg/upgrade/upgrade.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/upgrade/migrateapiversion"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/upgrade/migrateapiversion"
 )
 
 func NewCmdUpgrade(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command {

diff --git a/cmd/ctl/pkg/version/version.go b/cmd/ctl/pkg/version/version.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/kubectl/pkg/scheme"
 	"sigs.k8s.io/yaml"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/build"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/build"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	"github.com/cert-manager/cert-manager/pkg/util"
 	"github.com/cert-manager/cert-manager/pkg/util/versionchecker"
 )

diff --git a/make/ci.mk b/make/ci.mk
@@ -21,7 +21,7 @@ ci-presubmit: verify-imports verify-errexit verify-boilerplate verify-codegen ve
 
 .PHONY: verify-modules
 verify-modules: | $(NEEDS_CMREL)
-	$(CMREL) validate-gomod --path $(shell pwd) --direct-import-modules github.com/cert-manager/cert-manager/cmctl-binary --no-dummy-modules github.com/cert-manager/cert-manager/integration-tests
+	$(CMREL) validate-gomod --path $(shell pwd) --direct-import-modules github.com/cert-manager/cert-manager/cmd/ctl --no-dummy-modules github.com/cert-manager/cert-manager/integration-tests
 
 .PHONY: verify-imports
 verify-imports: | $(NEEDS_GOIMPORTS)

diff --git a/test/integration/LICENSES b/test/integration/LICENSES
@@ -10,7 +10,7 @@ github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LIC
 github.com/blang/semver/v4,https://github.com/blang/semver/blob/v4.0.0/v4/LICENSE,MIT
 github.com/cenkalti/backoff/v4,https://github.com/cenkalti/backoff/blob/v4.2.1/LICENSE,MIT
 github.com/cert-manager/cert-manager,https://github.com/cert-manager/cert-manager/blob/HEAD/LICENSE,Apache-2.0
-github.com/cert-manager/cert-manager/cmctl-binary,https://github.com/cert-manager/cert-manager/blob/HEAD/cmctl-binary/LICENSE,Apache-2.0
+github.com/cert-manager/cert-manager/cmd/ctl,https://github.com/cert-manager/cert-manager/blob/HEAD/cmctl-binary/LICENSE,Apache-2.0
 github.com/cert-manager/cert-manager/integration-tests,https://github.com/cert-manager/cert-manager/blob/HEAD/integration-tests/LICENSE,Apache-2.0
 github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.2.0/LICENSE.txt,MIT
 github.com/chai2010/gettext-go,https://github.com/chai2010/gettext-go/blob/v1.0.2/LICENSE,BSD-3-Clause

diff --git a/test/integration/ctl/ctl_convert_test.go b/test/integration/ctl/ctl_convert_test.go
@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/convert"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/convert"
 )
 
 const (

diff --git a/test/integration/ctl/ctl_create_cr_test.go b/test/integration/ctl/ctl_create_cr_test.go
@@ -30,8 +30,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/create/certificaterequest"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/create/certificaterequest"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
 	"github.com/cert-manager/cert-manager/integration-tests/framework"
 	cmapiv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"

diff --git a/test/integration/ctl/ctl_install.go b/test/integration/ctl/ctl_install.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/sergi/go-diff/diffmatchpatch"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/cmd"
+	"github.com/cert-manager/cert-manager/cmd/ctl/cmd"
 	"github.com/cert-manager/cert-manager/integration-tests/ctl/install_framework"
 	"github.com/cert-manager/cert-manager/integration-tests/internal/util"
 )

diff --git a/test/integration/ctl/ctl_renew_test.go b/test/integration/ctl/ctl_renew_test.go
@@ -26,8 +26,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/renew"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/renew"
 	"github.com/cert-manager/cert-manager/integration-tests/framework"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"

diff --git a/test/integration/ctl/ctl_status_certificate_test.go b/test/integration/ctl/ctl_status_certificate_test.go
@@ -31,8 +31,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/reference"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/factory"
-	statuscertcmd "github.com/cert-manager/cert-manager/cmctl-binary/pkg/status/certificate"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
+	statuscertcmd "github.com/cert-manager/cert-manager/cmd/ctl/pkg/status/certificate"
 	"github.com/cert-manager/cert-manager/integration-tests/framework"
 	apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
 	cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"

diff --git a/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go b/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/cert-manager/cert-manager/cmctl-binary/pkg/upgrade/migrateapiversion"
+	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/upgrade/migrateapiversion"
 	"github.com/cert-manager/cert-manager/integration-tests/framework"
 	"github.com/cert-manager/cert-manager/pkg/webhook/handlers"
 	"github.com/cert-manager/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/install"