From fc9b63d6f0aafab18308368beb94920f3efb93fd Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Thu, 31 Jan 2019 17:17:53 -0500 Subject: [PATCH] remove GCE cloud provider dependency to pkg/master/ports by duplicating the proxy port value --- pkg/cloudprovider/providers/gce/BUILD | 1 - pkg/cloudprovider/providers/gce/gce_healthchecks.go | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/BUILD b/pkg/cloudprovider/providers/gce/BUILD index 480659d9274..f826869148c 100644 --- a/pkg/cloudprovider/providers/gce/BUILD +++ b/pkg/cloudprovider/providers/gce/BUILD @@ -49,7 +49,6 @@ go_library( "//pkg/api/v1/service:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/util/net/sets:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", diff --git a/pkg/cloudprovider/providers/gce/gce_healthchecks.go b/pkg/cloudprovider/providers/gce/gce_healthchecks.go index a545b49f9e5..7572fd7deb6 100644 --- a/pkg/cloudprovider/providers/gce/gce_healthchecks.go +++ b/pkg/cloudprovider/providers/gce/gce_healthchecks.go @@ -28,12 +28,15 @@ import ( "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta" "k8s.io/api/core/v1" utilversion "k8s.io/apimachinery/pkg/util/version" - "k8s.io/kubernetes/pkg/master/ports" ) const ( - nodesHealthCheckPath = "/healthz" - lbNodesHealthCheckPort = ports.ProxyHealthzPort + nodesHealthCheckPath = "/healthz" + // NOTE: Please keep the following port in sync with ProxyHealthzPort in pkg/master/ports/ports.go + // ports.ProxyHealthzPort was not used here to avoid dependencies to k8s.io/kubernetes in the + // GCE cloud provider which is required as part of the out-of-tree cloud provider efforts. + // TODO: use a shared constant once ports in pkg/master/ports are in a common external repo. + lbNodesHealthCheckPort = 10256 ) var (