Merge pull request #249 from marun/bump-1.16

Bug 1755383: Bump deps to kubernetes-1.16.0

Author: openshift-merge-robot

Gopkg.lock

@@ -1,4 +1,4 @@
-required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types", "github.com/openshift/library-go/cmd/crd-schema-gen" ]
+required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
 
 [prune]
   non-go = true
@@ -22,46 +22,43 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types", "gith
 
 [[constraint]]
   name = "github.com/google/uuid"
-  revision = "8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3"
+  version = "v1.1.1"
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.0"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.0"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  # use origin fork with nullable support.
-  # TODO(sttts, sig-master): switch back to upstream version in 1.14
-  branch = "origin-4.1-kubernetes-1.13.4"
-  source = "https://github.com/openshift/kubernetes-apiextensions-apiserver"
+  version = "kubernetes-1.16.0"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.0"
 
 [[constraint]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.0"
 
 [[constraint]]
   name = "k8s.io/kube-aggregator"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.0"
 
 [[constraint]]
   name = "k8s.io/utils"
-  revision = "66066c83e385e385ccc3c964b44fd7dcd413d0ed"
+  revision = "581e00157fb1a0435d4fac54a52d1ca1e481d60e"
 
 [[override]]
   name = "k8s.io/gengo"
-  revision = "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2"
+  revision = "26a664648505d962332bda642b27306bc10d1082"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
-  version = "v0.0.3"
+  version = "v0.0.5"
 
 [[constraint]]
   name = "github.com/openshift/api"
@@ -74,10 +71,3 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types", "gith
 [[override]]
   name = "github.com/openshift/library-go"
   branch = "master"
-
-[[override]]
-  name = "sigs.k8s.io/controller-tools"
-  # use origin fork with nullable support.
-  # TODO(soltysh, sig-master): switch back to upstream version in 1.14
-  branch = "origin-4.1-kubernetes-1.13.4"
-  source = "https://github.com/openshift/kubernetes-sigs-controller-tools"

Gopkg.toml

@@ -38,7 +38,7 @@ func main() {
 				log.Fatalf("Unable to parse CRD %s: %v", path, err)
 			}
 			name = crd.Name
-			_, err = client.Apiextensions().CustomResourceDefinitions().Create(&crd)
+			_, err = client.ApiextensionsV1beta1().CustomResourceDefinitions().Create(&crd)
 			if errors.IsAlreadyExists(err) {
 				return true, nil
 			}

hack/test-prerequisites.go

@@ -9,7 +9,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/client-go/discovery/cached"
+	"k8s.io/client-go/discovery/cached/memory"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -30,7 +30,7 @@ var (
 // Private constructor for once.Do
 func newSingletonFactory(config *rest.Config) func() {
 	return func() {
-		cachedDiscoveryClient := cached.NewMemCacheClient(kubernetes.NewForConfigOrDie(config).Discovery())
+		cachedDiscoveryClient := memory.NewMemCacheClient(kubernetes.NewForConfigOrDie(config).Discovery())
 		restMapper := restmapper.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient)
 		restMapper.Reset()
 

pkg/cvo/internal/dynamicclient/client.go

@@ -13,8 +13,8 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
-	"strings"
 	"runtime"
+	"strings"
 	"testing"
 	"time"
 
@@ -196,7 +196,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
 
 	ns := fmt.Sprintf("e2e-cvo-%s", randutil.String(4))
 
-	if _, err := kc.Core().Namespaces().Create(&v1.Namespace{
+	if _, err := kc.CoreV1().Namespaces().Create(&v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: ns,
 		},
@@ -207,7 +207,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
 		if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete cluster version %s: %v", ns, err)
 		}
-		if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
+		if err := kc.CoreV1().Namespaces().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete namespace %s: %v", ns, err)
 		}
 	}()
@@ -348,7 +348,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
 
 	ns := fmt.Sprintf("e2e-cvo-%s", randutil.String(4))
 
-	if _, err := kc.Core().Namespaces().Create(&v1.Namespace{
+	if _, err := kc.CoreV1().Namespaces().Create(&v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: ns,
 		},
@@ -359,7 +359,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
 		if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete cluster version %s: %v", ns, err)
 		}
-		if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
+		if err := kc.CoreV1().Namespaces().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete namespace %s: %v", ns, err)
 		}
 	}()
@@ -476,7 +476,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 
 	ns := fmt.Sprintf("e2e-cvo-%s", randutil.String(6))
 
-	if _, err := kc.Core().Namespaces().Create(&v1.Namespace{
+	if _, err := kc.CoreV1().Namespaces().Create(&v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: ns,
 		},
@@ -487,7 +487,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 		if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete cluster version %s: %v", ns, err)
 		}
-		if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
+		if err := kc.CoreV1().Namespaces().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete namespace %s: %v", ns, err)
 		}
 	}()
@@ -519,7 +519,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 
 	// wait until the lock record exists
 	err = wait.PollImmediate(200*time.Millisecond, 60*time.Second, func() (bool, error) {
-		_, err := kc.Core().ConfigMaps(ns).Get(ns, metav1.GetOptions{})
+		_, err := kc.CoreV1().ConfigMaps(ns).Get(ns, metav1.GetOptions{})
 		if err != nil {
 			if errors.IsNotFound(err) {
 				return false, nil
@@ -533,7 +533,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 	}
 
 	t.Logf("verify the controller writes a leadership change event")
-	events, err := kc.Core().Events(ns).List(metav1.ListOptions{})
+	events, err := kc.CoreV1().Events(ns).List(metav1.ListOptions{})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -547,7 +547,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 	var endTime time.Time
 	// the lock should be deleted immediately
 	err = wait.PollImmediate(100*time.Millisecond, 10*time.Second, func() (bool, error) {
-		_, err := kc.Core().ConfigMaps(ns).Get(ns, metav1.GetOptions{})
+		_, err := kc.CoreV1().ConfigMaps(ns).Get(ns, metav1.GetOptions{})
 		if errors.IsNotFound(err) {
 			endTime = time.Now()
 			return true, nil
@@ -599,7 +599,7 @@ func TestIntegrationCVO_cincinnatiRequest(t *testing.T) {
 
 	ns := fmt.Sprintf("e2e-cvo-%s", randutil.String(4))
 
-	if _, err := kc.Core().Namespaces().Create(&v1.Namespace{
+	if _, err := kc.CoreV1().Namespaces().Create(&v1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: ns,
 		},
@@ -610,7 +610,7 @@ func TestIntegrationCVO_cincinnatiRequest(t *testing.T) {
 		if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete cluster version %s: %v", ns, err)
 		}
-		if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
+		if err := kc.CoreV1().Namespaces().Delete(ns, nil); err != nil {
 			t.Logf("failed to delete namespace %s: %v", ns, err)
 		}
 	}()