From e2bc3a755fff2bbc9c15c4b2a5fc5e753724c74a Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Wed, 1 Apr 2020 02:01:27 -0400 Subject: [PATCH] move well-known kubelet cloud provider annotations to k8s.io/cloud-provider (#88631) * move well-known kubelet cloud provider annotations to k8s.io/cloud-provider Signed-off-by: andrewsykim * cloud provider: rename AnnotationProvidedIPAddr to AnnotationAlphaProvidedIPAddr to indicate alpha status Signed-off-by: Andrew Sy Kim --- pkg/controller/cloud/BUILD | 2 -- pkg/controller/cloud/node_controller.go | 3 +-- pkg/controller/cloud/node_controller_test.go | 5 ++--- pkg/kubelet/apis/BUILD | 1 - pkg/kubelet/nodestatus/BUILD | 2 +- pkg/kubelet/nodestatus/setters.go | 4 ++-- staging/src/k8s.io/cloud-provider/api/BUILD | 5 ++++- .../k8s.io/cloud-provider/api}/well_known_annotations.go | 6 +++--- 8 files changed, 13 insertions(+), 15 deletions(-) rename {pkg/kubelet/apis => staging/src/k8s.io/cloud-provider/api}/well_known_annotations.go (82%) diff --git a/pkg/controller/cloud/BUILD b/pkg/controller/cloud/BUILD index 751f0a95c70..b43f80eec3c 100644 --- a/pkg/controller/cloud/BUILD +++ b/pkg/controller/cloud/BUILD @@ -10,7 +10,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/controller: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/api/errors:go_default_library", @@ -43,7 +42,6 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/controller/testutil:go_default_library", - "//pkg/kubelet/apis: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", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/pkg/controller/cloud/node_controller.go b/pkg/controller/cloud/node_controller.go index d8353e3c943..862e6b9de4a 100644 --- a/pkg/controller/cloud/node_controller.go +++ b/pkg/controller/cloud/node_controller.go @@ -39,7 +39,6 @@ import ( cloudproviderapi "k8s.io/cloud-provider/api" cloudnodeutil "k8s.io/cloud-provider/node/helpers" "k8s.io/klog" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" nodeutil "k8s.io/kubernetes/pkg/util/node" ) @@ -565,7 +564,7 @@ func nodeAddressesChangeDetected(addressSet1, addressSet2 []v1.NodeAddress) bool func ensureNodeProvidedIPExists(node *v1.Node, nodeAddresses []v1.NodeAddress) (*v1.NodeAddress, bool) { var nodeIP *v1.NodeAddress nodeIPExists := false - if providedIP, ok := node.ObjectMeta.Annotations[kubeletapis.AnnotationProvidedIPAddr]; ok { + if providedIP, ok := node.ObjectMeta.Annotations[cloudproviderapi.AnnotationAlphaProvidedIPAddr]; ok { nodeIPExists = true for i := range nodeAddresses { if nodeAddresses[i].Address == providedIP { diff --git a/pkg/controller/cloud/node_controller_test.go b/pkg/controller/cloud/node_controller_test.go index 4a5d662c998..450393688e6 100644 --- a/pkg/controller/cloud/node_controller_test.go +++ b/pkg/controller/cloud/node_controller_test.go @@ -34,7 +34,6 @@ import ( "k8s.io/cloud-provider" cloudproviderapi "k8s.io/cloud-provider/api" fakecloud "k8s.io/cloud-provider/fake" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" @@ -462,7 +461,7 @@ func Test_AddCloudNode(t *testing.T) { Name: "node0", CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Annotations: map[string]string{ - kubeletapis.AnnotationProvidedIPAddr: "10.0.0.1", + cloudproviderapi.AnnotationAlphaProvidedIPAddr: "10.0.0.1", }, }, Spec: v1.NodeSpec{ @@ -502,7 +501,7 @@ func Test_AddCloudNode(t *testing.T) { Name: "node0", CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Annotations: map[string]string{ - kubeletapis.AnnotationProvidedIPAddr: "10.0.0.1", + cloudproviderapi.AnnotationAlphaProvidedIPAddr: "10.0.0.1", }, }, Spec: v1.NodeSpec{ diff --git a/pkg/kubelet/apis/BUILD b/pkg/kubelet/apis/BUILD index 38505ce069e..086ad1cc5b5 100644 --- a/pkg/kubelet/apis/BUILD +++ b/pkg/kubelet/apis/BUILD @@ -8,7 +8,6 @@ load( go_library( name = "go_default_library", srcs = [ - "well_known_annotations.go", "well_known_annotations_windows.go", "well_known_labels.go", ], diff --git a/pkg/kubelet/nodestatus/BUILD b/pkg/kubelet/nodestatus/BUILD index fcf5f4e9c30..7d9ceba7a8a 100644 --- a/pkg/kubelet/nodestatus/BUILD +++ b/pkg/kubelet/nodestatus/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", @@ -21,6 +20,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/cloud-provider/api:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubelet/nodestatus/setters.go b/pkg/kubelet/nodestatus/setters.go index ef535bc72bd..393f5e2de35 100644 --- a/pkg/kubelet/nodestatus/setters.go +++ b/pkg/kubelet/nodestatus/setters.go @@ -33,10 +33,10 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" utilfeature "k8s.io/apiserver/pkg/util/feature" cloudprovider "k8s.io/cloud-provider" + cloudproviderapi "k8s.io/cloud-provider/api" "k8s.io/component-base/version" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -82,7 +82,7 @@ func NodeAddress(nodeIP net.IP, // typically Kubelet.nodeIP if node.ObjectMeta.Annotations == nil { node.ObjectMeta.Annotations = make(map[string]string) } - node.ObjectMeta.Annotations[kubeletapis.AnnotationProvidedIPAddr] = nodeIP.String() + node.ObjectMeta.Annotations[cloudproviderapi.AnnotationAlphaProvidedIPAddr] = nodeIP.String() } // If --cloud-provider=external and node address is already set, diff --git a/staging/src/k8s.io/cloud-provider/api/BUILD b/staging/src/k8s.io/cloud-provider/api/BUILD index 263a9a8ee0a..2371259bd42 100644 --- a/staging/src/k8s.io/cloud-provider/api/BUILD +++ b/staging/src/k8s.io/cloud-provider/api/BUILD @@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", - srcs = ["well_known_taints.go"], + srcs = [ + "well_known_annotations.go", + "well_known_taints.go", + ], importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/api", importpath = "k8s.io/cloud-provider/api", visibility = ["//visibility:public"], diff --git a/pkg/kubelet/apis/well_known_annotations.go b/staging/src/k8s.io/cloud-provider/api/well_known_annotations.go similarity index 82% rename from pkg/kubelet/apis/well_known_annotations.go rename to staging/src/k8s.io/cloud-provider/api/well_known_annotations.go index a87f1c073ad..fd03ea0a021 100644 --- a/pkg/kubelet/apis/well_known_annotations.go +++ b/staging/src/k8s.io/cloud-provider/api/well_known_annotations.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package apis +package api const ( - // AnnotationProvidedIPAddr is a node IP annotation set by the "external" cloud provider. + // AnnotationAlphaProvidedIPAddr is a node IP annotation set by the "external" cloud provider. // When kubelet is started with the "external" cloud provider, then // it sets this annotation on the node to denote an ip address set from the // cmd line flag (--node-ip). This ip is verified with the cloudprovider as valid by // the cloud-controller-manager - AnnotationProvidedIPAddr = "alpha.kubernetes.io/provided-node-ip" + AnnotationAlphaProvidedIPAddr = "alpha.kubernetes.io/provided-node-ip" )