diff --git a/hack/.import-aliases b/hack/.import-aliases index 7f582016790..41d8b10af2e 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -46,7 +46,7 @@ "k8s.io/kubelet/pkg/apis/pluginregistration/v1": "kubeletpluginregistrationv1", "k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1": "kubeletpluginregistrationv1alpha1", "k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1", - "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1", + "k8s.io/kubelet/pkg/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1": "kubeletresourcemetricsv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1", "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1": "proxyconfigv1alpha1", diff --git a/hack/update-generated-pod-resources-dockerized.sh b/hack/update-generated-pod-resources-dockerized.sh index 3e8d52bc759..fc4ff8d5a97 100755 --- a/hack/update-generated-pod-resources-dockerized.sh +++ b/hack/update-generated-pod-resources-dockerized.sh @@ -23,7 +23,7 @@ set -o nounset set -o pipefail KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd -P)" -POD_RESOURCES_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/podresources/v1alpha1/" +POD_RESOURCES_ALPHA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/" source "${KUBE_ROOT}/hack/lib/protoc.sh" kube::protoc::generate_proto "${POD_RESOURCES_ALPHA}" diff --git a/hack/update-generated-pod-resources.sh b/hack/update-generated-pod-resources.sh index d6257a3222c..5c295062d88 100755 --- a/hack/update-generated-pod-resources.sh +++ b/hack/update-generated-pod-resources.sh @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This script generates `/pkg/kubelet/apis/podresources/v1alpha1/api.pb.go` -# from the protobuf file `/pkg/kubelet/apis/podresources/v1alpha1/api.proto` +# This script generates `/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.pb.go` +# from the protobuf file `/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto` # for pods. # Usage: `hack/update-generated-pod-resources.sh`. diff --git a/hack/verify-generated-pod-resources.sh b/hack/verify-generated-pod-resources.sh index 34f4dc98d1d..eddfd9316b2 100755 --- a/hack/verify-generated-pod-resources.sh +++ b/hack/verify-generated-pod-resources.sh @@ -24,7 +24,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -POD_RESOURCES_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/podresources/v1alpha1/" +POD_RESOURCES_ALPHA="${KUBE_ROOT}/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/" source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env diff --git a/pkg/kubelet/apis/podresources/client.go b/pkg/kubelet/apis/podresources/client.go index 2f33fa441fd..2e871137a51 100644 --- a/pkg/kubelet/apis/podresources/client.go +++ b/pkg/kubelet/apis/podresources/client.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/util" ) diff --git a/pkg/kubelet/apis/podresources/server.go b/pkg/kubelet/apis/podresources/server.go index 63ac1b9470c..752d64c344f 100644 --- a/pkg/kubelet/apis/podresources/server.go +++ b/pkg/kubelet/apis/podresources/server.go @@ -20,7 +20,7 @@ import ( "context" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" ) // DevicesProvider knows how to provide the devices used by the given container diff --git a/pkg/kubelet/apis/podresources/server_test.go b/pkg/kubelet/apis/podresources/server_test.go index b292667e0ab..e9bda48504e 100644 --- a/pkg/kubelet/apis/podresources/server_test.go +++ b/pkg/kubelet/apis/podresources/server_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" ) type mockProvider struct { diff --git a/pkg/kubelet/cm/container_manager.go b/pkg/kubelet/cm/container_manager.go index a9cb41cbcfe..8436bfbac91 100644 --- a/pkg/kubelet/cm/container_manager.go +++ b/pkg/kubelet/cm/container_manager.go @@ -23,7 +23,7 @@ import ( // TODO: Migrate kubelet to either use its own internal objects or client library. v1 "k8s.io/api/core/v1" internalapi "k8s.io/cri-api/pkg/apis" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" "k8s.io/kubernetes/pkg/kubelet/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index a0d498a867d..fdad9cbd9dd 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -48,7 +48,7 @@ import ( "k8s.io/client-go/tools/record" internalapi "k8s.io/cri-api/pkg/apis" kubefeatures "k8s.io/kubernetes/pkg/features" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" diff --git a/pkg/kubelet/cm/container_manager_stub.go b/pkg/kubelet/cm/container_manager_stub.go index 3d89a67d554..850b9eaf109 100644 --- a/pkg/kubelet/cm/container_manager_stub.go +++ b/pkg/kubelet/cm/container_manager_stub.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" internalapi "k8s.io/cri-api/pkg/apis" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/config" diff --git a/pkg/kubelet/cm/container_manager_windows.go b/pkg/kubelet/cm/container_manager_windows.go index 574b78813ca..ce509440388 100644 --- a/pkg/kubelet/cm/container_manager_windows.go +++ b/pkg/kubelet/cm/container_manager_windows.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/tools/record" internalapi "k8s.io/cri-api/pkg/apis" kubefeatures "k8s.io/kubernetes/pkg/features" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go index f531795cb83..1105691e453 100644 --- a/pkg/kubelet/cm/devicemanager/manager.go +++ b/pkg/kubelet/cm/devicemanager/manager.go @@ -38,7 +38,7 @@ import ( pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/checkpoint" diff --git a/pkg/kubelet/cm/devicemanager/manager_stub.go b/pkg/kubelet/cm/devicemanager/manager_stub.go index 4c42686045c..ad54b17fbc4 100644 --- a/pkg/kubelet/cm/devicemanager/manager_stub.go +++ b/pkg/kubelet/cm/devicemanager/manager_stub.go @@ -18,7 +18,7 @@ package devicemanager import ( v1 "k8s.io/api/core/v1" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/lifecycle" diff --git a/pkg/kubelet/cm/devicemanager/pod_devices.go b/pkg/kubelet/cm/devicemanager/pod_devices.go index 399bf21999c..fef1e7785a2 100644 --- a/pkg/kubelet/cm/devicemanager/pod_devices.go +++ b/pkg/kubelet/cm/devicemanager/pod_devices.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/checkpoint" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/cm/devicemanager/types.go b/pkg/kubelet/cm/devicemanager/types.go index 0b891b129a4..39cdf65a14c 100644 --- a/pkg/kubelet/cm/devicemanager/types.go +++ b/pkg/kubelet/cm/devicemanager/types.go @@ -20,7 +20,7 @@ import ( "time" v1 "k8s.io/api/core/v1" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index d07971e899e..1950aa4edde 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -65,7 +65,7 @@ import ( "k8s.io/kubernetes/pkg/apis/core/v1/validation" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" - podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" diff --git a/pkg/kubelet/apis/podresources/v1alpha1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD similarity index 100% rename from pkg/kubelet/apis/podresources/v1alpha1/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD diff --git a/pkg/kubelet/apis/podresources/v1alpha1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.pb.go similarity index 100% rename from pkg/kubelet/apis/podresources/v1alpha1/api.pb.go rename to staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.pb.go diff --git a/pkg/kubelet/apis/podresources/v1alpha1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto similarity index 100% rename from pkg/kubelet/apis/podresources/v1alpha1/api.proto rename to staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto diff --git a/test/e2e_node/device_plugin_test.go b/test/e2e_node/device_plugin_test.go index f00a5a33650..4e304c565d0 100644 --- a/test/e2e_node/device_plugin_test.go +++ b/test/e2e_node/device_plugin_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" - kubeletpodresourcesv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 292c2efca4c..9b5d913f071 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" - kubeletpodresourcesv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" + kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cri/remote"