diff --git a/cmd/ctl/pkg/convert/BUILD.bazel b/cmd/ctl/pkg/convert/BUILD.bazel index 1ee5e3daf..e2ed429ad 100644 --- a/cmd/ctl/pkg/convert/BUILD.bazel +++ b/cmd/ctl/pkg/convert/BUILD.bazel @@ -6,12 +6,9 @@ go_library( importpath = "github.com/jetstack/cert-manager/cmd/ctl/pkg/convert", visibility = ["//visibility:public"], deps = [ - "//pkg/acme/webhook/apis/acme/v1alpha1:go_default_library", "//pkg/apis/certmanager/v1alpha2:go_default_library", "//pkg/webhook:go_default_library", "@com_github_spf13_cobra//:go_default_library", - "@io_k8s_api//auditregistration/v1alpha1:go_default_library", - "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/internalversion:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", @@ -24,7 +21,6 @@ go_library( "@io_k8s_cli_runtime//pkg/resource:go_default_library", "@io_k8s_client_go//kubernetes/scheme:go_default_library", "@io_k8s_klog//:go_default_library", - "@io_k8s_kube_aggregator//pkg/apis/apiregistration/v1beta1:go_default_library", "@io_k8s_kubectl//pkg/cmd/util:go_default_library", "@io_k8s_kubectl//pkg/util/i18n:go_default_library", "@io_k8s_kubectl//pkg/util/templates:go_default_library", diff --git a/cmd/ctl/pkg/convert/convert.go b/cmd/ctl/pkg/convert/convert.go index aeb99fdf7..0e9cd6b46 100644 --- a/cmd/ctl/pkg/convert/convert.go +++ b/cmd/ctl/pkg/convert/convert.go @@ -20,8 +20,6 @@ import ( "fmt" "github.com/spf13/cobra" - auditreg "k8s.io/api/auditregistration/v1alpha1" - apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -34,12 +32,10 @@ import ( "k8s.io/cli-runtime/pkg/resource" kscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog" - apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - whapi "github.com/jetstack/cert-manager/pkg/acme/webhook/apis/acme/v1alpha1" cmapiv1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" "github.com/jetstack/cert-manager/pkg/webhook" ) @@ -69,28 +65,17 @@ var ( // and their conversion functions registered. // In future we may we want to consider creating a dedicated scheme used by // the ctl tool. - scheme = webhook.Scheme - codecs = serializer.NewCodecFactory(scheme) - parameterCodec = runtime.NewParameterCodec(scheme) - localSchemeBuilder = runtime.SchemeBuilder{ - whapi.AddToScheme, - kscheme.AddToScheme, - apireg.AddToScheme, - apiext.AddToScheme, - auditreg.AddToScheme, - } - - addToScheme = localSchemeBuilder.AddToScheme + scheme = webhook.Scheme ) func init() { - // This is used to add the List object type for outputing multiple input + // This is used to add the List object type for outputting multiple input // objects. coreGroupVersion := schema.GroupVersion{Group: "", Version: runtime.APIVersionInternal} scheme.AddKnownTypes(coreGroupVersion, &metainternalversion.List{}) metav1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - utilruntime.Must(addToScheme(scheme)) + utilruntime.Must(kscheme.AddToScheme(scheme)) } // Options is a struct to support convert command @@ -157,8 +142,7 @@ func (o *Options) Run() error { r := builder. WithScheme(scheme, schema.GroupVersion{Group: cmapiv1alpha2.SchemeGroupVersion.Group, Version: runtime.APIVersionInternal}). - LocalParam(true).ContinueOnError(). - FilenameParam(false, &o.FilenameOptions).Flatten().Do() + LocalParam(true).FilenameParam(false, &o.FilenameOptions).Flatten().Do() if err := r.Err(); err != nil { return fmt.Errorf("error here: %s", err)