From da1ea1c7f07f221fbfc000b01686c96b29dda641 Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Wed, 30 Jan 2019 12:06:52 -0500 Subject: [PATCH] move cloud node helper functions to k8s.io/cloud-provider/node/helpers --- pkg/cloudprovider/providers/aws/BUILD | 2 +- pkg/cloudprovider/providers/aws/aws.go | 4 +-- staging/src/k8s.io/cloud-provider/node/BUILD | 25 +++----------- .../k8s.io/cloud-provider/node/helpers/BUILD | 33 +++++++++++++++++++ .../node/{ => helpers}/taints.go | 2 +- 5 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 staging/src/k8s.io/cloud-provider/node/helpers/BUILD rename staging/src/k8s.io/cloud-provider/node/{ => helpers}/taints.go (99%) diff --git a/pkg/cloudprovider/providers/aws/BUILD b/pkg/cloudprovider/providers/aws/BUILD index 55995979d1..cb19345627 100644 --- a/pkg/cloudprovider/providers/aws/BUILD +++ b/pkg/cloudprovider/providers/aws/BUILD @@ -44,7 +44,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", - "//staging/src/k8s.io/cloud-provider/node:go_default_library", + "//staging/src/k8s.io/cloud-provider/node/helpers:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/credentials:go_default_library", diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 0e05bade88..a335e640dd 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -57,7 +57,7 @@ import ( v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" cloudprovider "k8s.io/cloud-provider" - cloudnode "k8s.io/cloud-provider/node" + nodehelpers "k8s.io/cloud-provider/node/helpers" "k8s.io/kubernetes/pkg/api/v1/service" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/version" @@ -1938,7 +1938,7 @@ func (c *Cloud) applyUnSchedulableTaint(nodeName types.NodeName, reason string) Value: "true", Effect: v1.TaintEffectNoSchedule, } - err := cloudnode.AddOrUpdateTaintOnNode(c.kubeClient, string(nodeName), taint) + err := nodehelpers.AddOrUpdateTaintOnNode(c.kubeClient, string(nodeName), taint) if err != nil { klog.Errorf("Error applying taint to node %s with error %v", nodeName, err) return diff --git a/staging/src/k8s.io/cloud-provider/node/BUILD b/staging/src/k8s.io/cloud-provider/node/BUILD index ee1e649903..66c23210df 100644 --- a/staging/src/k8s.io/cloud-provider/node/BUILD +++ b/staging/src/k8s.io/cloud-provider/node/BUILD @@ -1,23 +1,3 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["taints.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/node", - importpath = "k8s.io/cloud-provider/node", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/equality: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", - "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes:go_default_library", - "//staging/src/k8s.io/client-go/util/retry:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -27,7 +7,10 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/cloud-provider/node/helpers:all-srcs", + ], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/staging/src/k8s.io/cloud-provider/node/helpers/BUILD b/staging/src/k8s.io/cloud-provider/node/helpers/BUILD new file mode 100644 index 0000000000..9ac9a5a927 --- /dev/null +++ b/staging/src/k8s.io/cloud-provider/node/helpers/BUILD @@ -0,0 +1,33 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["taints.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/node/helpers", + importpath = "k8s.io/cloud-provider/node/helpers", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/equality: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", + "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/util/retry:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/staging/src/k8s.io/cloud-provider/node/taints.go b/staging/src/k8s.io/cloud-provider/node/helpers/taints.go similarity index 99% rename from staging/src/k8s.io/cloud-provider/node/taints.go rename to staging/src/k8s.io/cloud-provider/node/helpers/taints.go index 89ed8f2151..2e3e31cce5 100644 --- a/staging/src/k8s.io/cloud-provider/node/taints.go +++ b/staging/src/k8s.io/cloud-provider/node/helpers/taints.go @@ -22,7 +22,7 @@ dependencies to k8s.io/kubernetes in all the cloud providers. Once k8s.io/kubern is moved to an external repository, this file should be removed and replaced with that one. */ -package node +package helpers import ( "encoding/json"