From b4e4db336f690606fcdb69bf1d3109f4edc9bd7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Wed, 5 Apr 2023 15:14:51 +0300 Subject: [PATCH] More migrations from genericclioptions to genericiooptions --- cmd/clicheck/check_cli_conventions.go | 1 + cmd/gendocs/gen_kubectl_docs.go | 1 + cmd/genyaml/gen_kubectl_yaml.go | 1 + cmd/kubectl-convert/kubectl-convert.go | 1 + pkg/kubectl/cmd/convert/convert.go | 1 + pkg/kubectl/cmd/convert/convert_test.go | 1 + .../src/k8s.io/cli-runtime/pkg/genericiooptions/io_options.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go | 1 + staging/src/k8s.io/sample-cli-plugin/cmd/kubectl-ns.go | 1 + staging/src/k8s.io/sample-cli-plugin/pkg/cmd/ns.go | 1 + vendor/modules.txt | 1 + 11 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmd/clicheck/check_cli_conventions.go b/cmd/clicheck/check_cli_conventions.go index 932a868f0dd..b190852aec9 100644 --- a/cmd/clicheck/check_cli_conventions.go +++ b/cmd/clicheck/check_cli_conventions.go @@ -21,6 +21,7 @@ import ( "io" "os" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/kubectl/pkg/cmd" cmdsanity "k8s.io/kubectl/pkg/cmd/util/sanity" ) diff --git a/cmd/gendocs/gen_kubectl_docs.go b/cmd/gendocs/gen_kubectl_docs.go index 0f1e6372194..57a7a98c88b 100644 --- a/cmd/gendocs/gen_kubectl_docs.go +++ b/cmd/gendocs/gen_kubectl_docs.go @@ -23,6 +23,7 @@ import ( "os" "github.com/spf13/cobra/doc" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/kubectl/pkg/cmd" "k8s.io/kubernetes/cmd/genutils" ) diff --git a/cmd/genyaml/gen_kubectl_yaml.go b/cmd/genyaml/gen_kubectl_yaml.go index fc104d22b0b..7584485a867 100644 --- a/cmd/genyaml/gen_kubectl_yaml.go +++ b/cmd/genyaml/gen_kubectl_yaml.go @@ -26,6 +26,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "gopkg.in/yaml.v2" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/kubectl/pkg/cmd" "k8s.io/kubernetes/cmd/genutils" ) diff --git a/cmd/kubectl-convert/kubectl-convert.go b/cmd/kubectl-convert/kubectl-convert.go index 9f65fc73541..a507460c538 100644 --- a/cmd/kubectl-convert/kubectl-convert.go +++ b/cmd/kubectl-convert/kubectl-convert.go @@ -22,6 +22,7 @@ import ( "github.com/spf13/pflag" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/component-base/cli" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" diff --git a/pkg/kubectl/cmd/convert/convert.go b/pkg/kubectl/cmd/convert/convert.go index a01e635d843..1a2407a2a26 100644 --- a/pkg/kubectl/cmd/convert/convert.go +++ b/pkg/kubectl/cmd/convert/convert.go @@ -26,6 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" diff --git a/pkg/kubectl/cmd/convert/convert_test.go b/pkg/kubectl/cmd/convert/convert_test.go index 0c4ca18a5b7..5f64b450660 100644 --- a/pkg/kubectl/cmd/convert/convert_test.go +++ b/pkg/kubectl/cmd/convert/convert_test.go @@ -23,6 +23,7 @@ import ( "strings" "testing" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) diff --git a/staging/src/k8s.io/cli-runtime/pkg/genericiooptions/io_options.go b/staging/src/k8s.io/cli-runtime/pkg/genericiooptions/io_options.go index 738e7078e15..247b1c2ee13 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/genericiooptions/io_options.go +++ b/staging/src/k8s.io/cli-runtime/pkg/genericiooptions/io_options.go @@ -1,5 +1,5 @@ /* -Copyright 2018 The Kubernetes Authors. +Copyright 2023 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go index 957fd0a85fe..db43152dcd0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" diff --git a/staging/src/k8s.io/sample-cli-plugin/cmd/kubectl-ns.go b/staging/src/k8s.io/sample-cli-plugin/cmd/kubectl-ns.go index a3a85e43a79..94dfdfbc87f 100644 --- a/staging/src/k8s.io/sample-cli-plugin/cmd/kubectl-ns.go +++ b/staging/src/k8s.io/sample-cli-plugin/cmd/kubectl-ns.go @@ -21,6 +21,7 @@ import ( "github.com/spf13/pflag" + "k8s.io/cli-runtime/pkg/genericiooptions" "k8s.io/sample-cli-plugin/pkg/cmd" ) diff --git a/staging/src/k8s.io/sample-cli-plugin/pkg/cmd/ns.go b/staging/src/k8s.io/sample-cli-plugin/pkg/cmd/ns.go index 802170e1eaa..1f93a05c9a9 100644 --- a/staging/src/k8s.io/sample-cli-plugin/pkg/cmd/ns.go +++ b/staging/src/k8s.io/sample-cli-plugin/pkg/cmd/ns.go @@ -26,6 +26,7 @@ import ( "k8s.io/client-go/tools/clientcmd/api" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/genericiooptions" ) var ( diff --git a/vendor/modules.txt b/vendor/modules.txt index 3e9bf905103..4aeea48ae18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1558,6 +1558,7 @@ k8s.io/apiserver/plugin/pkg/authorizer/webhook # k8s.io/cli-runtime v0.0.0 => ./staging/src/k8s.io/cli-runtime ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions +k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource # k8s.io/client-go v0.0.0 => ./staging/src/k8s.io/client-go