github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-21 14:38:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73616 from dims/move-part-of-kubelet-apis-well-known-lables

Browse Source 
move pkg/kubelet/apis/well_known_labels.go to staging/src/k8s.io/api/core/v1/
This commit is contained in:
Kubernetes Prow Robot
2019-02-07 19:44:34 -08:00
committed by GitHub
parent 92db54cc53 6e954322b3
commit eac19a3ab9
91 changed files with 524 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/phases/kubelet/BUILD
View File

@@ -45,7 +45,6 @@ go_test(
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//cmd/kubeadm/app/constants:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/apis/config:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

3
cmd/kubeadm/app/phases/kubelet/dynamic_test.go
View File

@@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/util/version"
"k8s.io/client-go/kubernetes/fake"
core "k8s.io/client-go/testing"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
)
func TestEnableDynamicConfigForNode(t *testing.T) {
@@ -35,7 +34,7 @@ func TestEnableDynamicConfigForNode(t *testing.T) {
return true, &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: nodeName,
Labels: map[string]string{kubeletapis.LabelHostname: nodeName},
Labels: map[string]string{v1.LabelHostname: nodeName},
},
Spec: v1.NodeSpec{
ConfigSource: &v1.NodeConfigSource{

1
cmd/kubeadm/app/phases/markcontrolplane/BUILD
View File

@@ -12,7 +12,6 @@ go_test(
embed = [":go_default_library"],
deps = [
"//cmd/kubeadm/app/constants:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/util/node:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

3
cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane_test.go
View File

@@ -29,7 +29,6 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"k8s.io/kubernetes/pkg/util/node"
)
@@ -116,7 +115,7 @@ func TestMarkControlPlane(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: hostname,
Labels: map[string]string{
kubeletapis.LabelHostname: hostname,
v1.LabelHostname: hostname,
},
},
}