Merge pull request #803 from prameshj/k8s-1.15

Move to k8s 1.15
kubernetes · Jul 25, 2019 · 0e67310 · 0e67310
2 parents c557136 + f3b6aaa
commit 0e67310
Show file tree

Hide file tree

Showing 240 changed files with 12,411 additions and 4,943 deletions.
diff --git a/cmd/glbc/app/clients.go b/cmd/glbc/app/clients.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	// Register the GCP authorization provider.
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

diff --git a/go.mod b/go.mod
@@ -31,16 +31,17 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.2.2 // indirect
-	k8s.io/api v0.0.0-20190418212532-b8e4ab4b136a
-	k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
-	k8s.io/apimachinery v0.0.0-20190418212431-b3683fe6b520
-	k8s.io/client-go v0.0.0-20190418212717-1d2e9628a1ee
-	k8s.io/cloud-provider v0.0.0-20190418214227-029ecc113e6d
-	k8s.io/component-base v0.0.0-20190418213057-380654ddefc0
-	k8s.io/klog v0.3.0
-	k8s.io/kube-openapi v0.0.0-20190418160015-6b3d3b2d5666
-	k8s.io/kubernetes v1.14.1
-	k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7
+	k8s.io/api v0.0.0
+	k8s.io/apiextensions-apiserver v0.0.0
+	k8s.io/apimachinery v0.0.0
+	k8s.io/client-go v0.0.0
+	k8s.io/cloud-provider v0.0.0
+	k8s.io/component-base v0.0.0
+	k8s.io/klog v0.3.1
+	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
+	k8s.io/kubernetes v1.15.0
+	k8s.io/legacy-cloud-providers v0.0.0
+	k8s.io/utils v0.0.0-20190221042446-c2654d5206da
 )
 
 replace (
@@ -78,14 +79,27 @@ replace (
 	gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1
 	gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.2
 	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api => k8s.io/api v0.0.0-20190418212532-b8e4ab4b136a
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190418212431-b3683fe6b520
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190418212717-1d2e9628a1ee
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190418214227-029ecc113e6d
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20190418213057-380654ddefc0
+	k8s.io/api => k8s.io/api v0.0.0-20190620085002-8f739060a0b3
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190620085550-3a2f62f126c9
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190620085203-5d32fb3b42f4
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190620085659-429467d76d0e
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085041-d697df55dbe9
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190620090041-1a7e1f6630cd
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190620090010-a60497bb9ffa
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190620085131-4cd66be69262
+	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190620090114-816aa063c73d
 	k8s.io/klog => k8s.io/klog v0.3.0
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190418160015-6b3d3b2d5666
-	k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
-	k8s.io/utils => k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190620085316-c835efc41000
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190620085943-52018c8ce3c1
+	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190620085811-cc0b23ba60a9
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190620085909-5dfb14b3a101
+	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190620085837-98477dc0c87c
+	k8s.io/kubernetes => k8s.io/kubernetes v1.15.0
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190620090159-a9e4f3cb5bf3
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20190620085627-5b02f62e9559
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190620085357-8191e314a1f7
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/backends/backends.go b/pkg/backends/backends.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 // Backends handles CRUD operations for backends.

diff --git a/pkg/backends/features/securitypolicy.go b/pkg/backends/features/securitypolicy.go
@@ -25,7 +25,7 @@ import (
 
 	gcecloud "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"

diff --git a/pkg/backends/features/securitypolicy_test.go b/pkg/backends/features/securitypolicy_test.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	backendconfigv1beta1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1beta1"
 	"k8s.io/ingress-gce/pkg/composite"

diff --git a/pkg/backends/ig_linker_test.go b/pkg/backends/ig_linker_test.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-gce/pkg/annotations"
 	"k8s.io/ingress-gce/pkg/instances"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 const defaultZone = "zone-a"

diff --git a/pkg/backends/integration_test.go b/pkg/backends/integration_test.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	"k8s.io/ingress-gce/pkg/instances"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 type Jig struct {

diff --git a/pkg/backends/neg_linker_test.go b/pkg/backends/neg_linker_test.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/ingress-gce/pkg/annotations"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 func newTestNEGLinker(fakeNEG negtypes.NetworkEndpointGroupCloud, fakeGCE *gce.Cloud) *negLinker {

diff --git a/pkg/backends/syncer.go b/pkg/backends/syncer.go
@@ -15,18 +15,18 @@ package backends
 
 import (
 	"fmt"
-	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"net/http"
 	"strings"
 
-	"k8s.io/api/core/v1"
+	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/ingress-gce/pkg/backends/features"
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	"k8s.io/ingress-gce/pkg/utils"
 	"k8s.io/klog"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 // backendSyncer manages the lifecycle of backends.

diff --git a/pkg/backends/syncer_test.go b/pkg/backends/syncer_test.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/ingress-gce/pkg/backends/features"
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 var (

diff --git a/pkg/composite/composite.go b/pkg/composite/composite.go
@@ -25,7 +25,7 @@ import (
 	"google.golang.org/api/compute/v1"
 	"k8s.io/ingress-gce/pkg/composite/metrics"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 // TODO: (shance) below functions should be generated

diff --git a/pkg/composite/gen.go b/pkg/composite/gen.go
@@ -30,7 +30,7 @@ import (
 	"google.golang.org/api/googleapi"
 	compositemetrics "k8s.io/ingress-gce/pkg/composite/metrics"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 // AuthenticationPolicy is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent

diff --git a/pkg/composite/gen/main.go b/pkg/composite/gen/main.go
@@ -87,7 +87,7 @@ import (
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter"
 	cloudprovider "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	compositemetrics "k8s.io/ingress-gce/pkg/composite/metrics"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 `
 	tmpl := template.Must(template.New("header").Parse(text))

diff --git a/pkg/composite/utils.go b/pkg/composite/utils.go
@@ -19,10 +19,11 @@ package composite
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
+
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
-	"reflect"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 // CreateKey() is a helper function for creating a meta.Key when interacting with the

diff --git a/pkg/composite/utils_test.go b/pkg/composite/utils_test.go
@@ -17,10 +17,11 @@ limitations under the License.
 package composite
 
 import (
-	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"reflect"
 	"testing"
+
+	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 func TestCreateKey(t *testing.T) {

diff --git a/pkg/context/context.go b/pkg/context/context.go
@@ -33,7 +33,7 @@ import (
 	frontendconfigclient "k8s.io/ingress-gce/pkg/frontendconfig/client/clientset/versioned"
 	informerfrontendconfig "k8s.io/ingress-gce/pkg/frontendconfig/client/informers/externalversions/frontendconfig/v1beta1"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 const (

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/ingress-gce/pkg/test"
 	"k8s.io/ingress-gce/pkg/tls"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 	"strings"
 	"testing"
 	"time"

diff --git a/pkg/firewalls/controller.go b/pkg/firewalls/controller.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-gce/pkg/controller/translator"
 	"k8s.io/ingress-gce/pkg/utils"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 var (

diff --git a/pkg/firewalls/controller_test.go b/pkg/firewalls/controller_test.go
@@ -27,7 +27,7 @@ import (
 	backendconfigclient "k8s.io/ingress-gce/pkg/backendconfig/client/clientset/versioned/fake"
 	test "k8s.io/ingress-gce/pkg/test"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/ingress-gce/pkg/context"

diff --git a/pkg/firewalls/firewalls.go b/pkg/firewalls/firewalls.go
@@ -25,7 +25,7 @@ import (
 
 	compute "google.golang.org/api/compute/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 	netset "k8s.io/utils/net"
 
 	"k8s.io/ingress-gce/pkg/utils"

diff --git a/pkg/healthchecks/healthchecks_test.go b/pkg/healthchecks/healthchecks_test.go
@@ -17,16 +17,16 @@ limitations under the License.
 package healthchecks
 
 import (
-	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
-	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"net/http"
 	"testing"
 
+	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
+	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/ingress-gce/pkg/annotations"
 	"k8s.io/ingress-gce/pkg/utils"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 var (

diff --git a/pkg/loadbalancers/l7.go b/pkg/loadbalancers/l7.go
@@ -19,10 +19,11 @@ package loadbalancers
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"k8s.io/ingress-gce/pkg/composite"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
-	"strings"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"

diff --git a/pkg/loadbalancers/l7s.go b/pkg/loadbalancers/l7s.go
@@ -18,9 +18,10 @@ package loadbalancers
 
 import (
 	"fmt"
+
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"k8s.io/ingress-gce/pkg/loadbalancers/features"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	"k8s.io/klog"
 

diff --git a/pkg/loadbalancers/l7s_test.go b/pkg/loadbalancers/l7s_test.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/ingress-gce/pkg/context"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 const (

diff --git a/pkg/loadbalancers/loadbalancers_test.go b/pkg/loadbalancers/loadbalancers_test.go
@@ -19,15 +19,16 @@ package loadbalancers
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"testing"
+
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock"
 	"google.golang.org/api/googleapi"
 	"k8s.io/ingress-gce/pkg/composite"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"k8s.io/kubernetes/pkg/util/slice"
-	"net/http"
-	"testing"
+	"k8s.io/legacy-cloud-providers/gce"
 
 	"google.golang.org/api/compute/v1"
 	extensions "k8s.io/api/extensions/v1beta1"

diff --git a/pkg/neg/controller_test.go b/pkg/neg/controller_test.go
@@ -37,7 +37,7 @@ import (
 	"k8s.io/ingress-gce/pkg/utils"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 	"strconv"
 )
 

diff --git a/pkg/neg/manager_test.go b/pkg/neg/manager_test.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/ingress-gce/pkg/neg/types"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 	"reflect"
 )
 

diff --git a/pkg/neg/readiness/reflector_test.go b/pkg/neg/readiness/reflector_test.go
@@ -26,7 +26,7 @@ import (
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
 	"k8s.io/ingress-gce/pkg/neg/types/shared"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 	"reflect"
 	"testing"
 	"time"

diff --git a/pkg/neg/syncers/transaction_test.go b/pkg/neg/syncers/transaction_test.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/ingress-gce/pkg/neg/readiness"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 const (

diff --git a/pkg/neg/syncers/utils_test.go b/pkg/neg/syncers/utils_test.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 func TestEncodeDecodeEndpoint(t *testing.T) {

diff --git a/pkg/neg/types/cloudprovideradapter.go b/pkg/neg/types/cloudprovideradapter.go
@@ -24,7 +24,7 @@ import (
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"google.golang.org/api/compute/v1"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 )
 
 // NewAdapter takes a Cloud and returns a NetworkEndpointGroupCloud.

diff --git a/pkg/neg/types/mock.go b/pkg/neg/types/mock.go
@@ -25,7 +25,7 @@ import (
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	"k8s.io/legacy-cloud-providers/gce"
 	"net/http"
 )