diff --git a/hack/.golint_failures b/hack/.golint_failures index a918ef88f0..4000805f41 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -87,7 +87,6 @@ pkg/apis/storage/v1beta1/util pkg/auth/authorizer/abac pkg/capabilities pkg/cloudprovider/providers/fake -pkg/cloudprovider/providers/gce/cloud pkg/cloudprovider/providers/photon pkg/cloudprovider/providers/vsphere pkg/cloudprovider/providers/vsphere/vclib diff --git a/hack/update-cloudprovider-gce.sh b/hack/update-cloudprovider-gce.sh deleted file mode 100755 index b35c429f8a..0000000000 --- a/hack/update-cloudprovider-gce.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2018 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -source "${KUBE_ROOT}/hack/lib/init.sh" -GENERATOR="${KUBE_ROOT}/pkg/cloudprovider/providers/gce/cloud/gen/main.go" - -GEN_GO="${KUBE_ROOT}/pkg/cloudprovider/providers/gce/cloud/gen.go" -GEN_TEST_GO="${KUBE_ROOT}/pkg/cloudprovider/providers/gce/cloud/gen_test.go" - -kube::golang::setup_env - -TMPFILE=$(mktemp verify-cloudprovider-gce-XXXX) -trap "{ rm -f ${TMPFILE}; }" EXIT - -go run "${GENERATOR}" > ${TMPFILE} -mv "${TMPFILE}" "${GEN_GO}" -go run "${GENERATOR}" -mode test > ${TMPFILE} -mv "${TMPFILE}" "${GEN_TEST_GO}" - -exit 0 diff --git a/test/e2e/network/network_tiers.go b/test/e2e/network/network_tiers.go index c102d52e3d..459be2b2cf 100644 --- a/test/e2e/network/network_tiers.go +++ b/test/e2e/network/network_tiers.go @@ -23,12 +23,12 @@ import ( computealpha "google.golang.org/api/compute/v0.alpha" - "k8s.io/api/core/v1" + "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" cloudprovider "k8s.io/cloud-provider" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" - "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/providers/gce" diff --git a/test/integration/ipamperf/cloud.go b/test/integration/ipamperf/cloud.go index c7cb10ec10..63c4681ee1 100644 --- a/test/integration/ipamperf/cloud.go +++ b/test/integration/ipamperf/cloud.go @@ -21,10 +21,10 @@ import ( "net" "sync" + "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" + "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta" beta "google.golang.org/api/compute/v0.beta" ga "google.golang.org/api/compute/v1" - "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud" - "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset" "k8s.io/kubernetes/test/integration/util" ) diff --git a/test/integration/util/cloud.go b/test/integration/util/cloud.go index 0d018a4e96..c701a5410b 100644 --- a/test/integration/util/cloud.go +++ b/test/integration/util/cloud.go @@ -19,9 +19,9 @@ package util import ( "time" + "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" "golang.org/x/oauth2" "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" - "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud" ) const (