Merge pull request #285 from tremes/version_upgrade

Bug 1882210: Upgrade OpenShift & K8s API versions

Author: openshift-merge-robot

Makefile

@@ -10,7 +10,7 @@ test-unit:
 test-e2e:
 	go test ./test/integration -v -run ^\(TestIsIOHealthy\)$$ ^\(TestPullSecretExists\)$$ -timeout 6m30s
 	test/integration/resource_samples/apply.sh
-	go test ./test/integration -v -timeout 25m $(TEST_OPTIONS)
+	go test ./test/integration -v -timeout 40m $(TEST_OPTIONS)
 .PHONY: test-e2e
 
 vet:

go.mod

@@ -3,34 +3,33 @@ module github.com/openshift/insights-operator
 go 1.14
 
 require (
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/getsentry/raven-go v0.2.1-0.20190513200303-c977f96e1095 // indirect
-	github.com/gorilla/websocket v1.4.1 // indirect
+	github.com/go-logr/logr v0.3.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
-	github.com/openshift/api v0.0.0-20200326160804-ecb9283fe820
-	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
-	github.com/openshift/library-go v0.0.0-20200421122923-c1de486c7d47
-	github.com/spf13/cobra v0.0.5
+	github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f
+	github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
+	github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	golang.org/x/net v0.0.0-20200301022130-244492dfa37a
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
-	google.golang.org/appengine v1.6.1 // indirect
-	k8s.io/api v0.18.9
-	k8s.io/apiextensions-apiserver v0.18.9
-	k8s.io/apimachinery v0.18.9
+	golang.org/x/net v0.0.0-20201209123823-ac852fbbde11
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/api v0.20.0
+	k8s.io/apiextensions-apiserver v0.20.0
+	k8s.io/apimachinery v0.20.0
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/component-base v0.18.9
-	k8s.io/klog v1.0.0
+	k8s.io/component-base v0.20.0
+	k8s.io/klog/v2 v2.4.0
 )
 
 replace (
-	github.com/openshift/api => github.com/openshift/api v0.0.0-20200326160804-ecb9283fe820
-	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
-	github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20200421122923-c1de486c7d47
-	k8s.io/api => k8s.io/api v0.18.9
-	k8s.io/apimachinery => k8s.io/apimachinery v0.18.9
-	k8s.io/apiserver => k8s.io/apiserver v0.18.9
-	k8s.io/client-go => k8s.io/client-go v0.18.9
+	github.com/openshift/api => github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f
+	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
+	github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20201214135256-d265f469e75b
+	k8s.io/api => k8s.io/api v0.20.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
+	k8s.io/apiserver => k8s.io/apiserver v0.20.0
+	k8s.io/client-go => k8s.io/client-go v0.20.0
 )

go.sum

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // NewReceiver is a debug endpoint that allows testing of the status destination.

pkg/cmd/start/receiver.go

@@ -11,7 +11,7 @@ import (
 	"github.com/openshift/library-go/pkg/serviceability"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/pkg/version"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/insights-operator/pkg/config"
 	"github.com/openshift/insights-operator/pkg/controller"

pkg/cmd/start/start.go

@@ -13,7 +13,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/insights-operator/pkg/config"
 )

pkg/config/configobserver/configobserver.go

@@ -16,7 +16,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	clsetfake "k8s.io/client-go/kubernetes/fake"
 	corefake "k8s.io/client-go/kubernetes/typed/core/v1/fake"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	clienttesting "k8s.io/client-go/testing"
 )

pkg/config/configobserver/configobserver_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/controller/operator.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"

pkg/controller/periodic/periodic.go

@@ -21,7 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // How many upload failures in a row we tolerate before starting reporting

pkg/controller/status/status.go

@@ -6,7 +6,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	configfake "github.com/openshift/client-go/config/clientset/versioned/fake"

pkg/controller/status/status_test.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 type Interface interface {

pkg/controllerstatus/controllerstatus.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"k8s.io/client-go/rest"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 
@@ -37,33 +37,33 @@ type gatherFunction func(g *Gatherer) ([]record.Record, []error)
 const gatherAll = "ALL"
 
 var gatherFunctions = map[string]gatherFunction{
-	"pdbs": GatherPodDisruptionBudgets,
-	"metrics": GatherMostRecentMetrics,
-	"operators": GatherClusterOperators,
-	"container_images": GatherContainerImages,
-	"nodes": GatherNodes,
-	"config_maps": GatherConfigMaps,
-	"version": GatherClusterVersion,
-	"id": GatherClusterID,
-	"infrastructures": GatherClusterInfrastructure,
-	"networks": GatherClusterNetwork,
-	"authentication": GatherClusterAuthentication,
-	"image_registries": GatherClusterImageRegistry,
-	"image_pruners": GatherClusterImagePruner,
-	"feature_gates": GatherClusterFeatureGates,
-	"oauths": GatherClusterOAuth,
-	"ingress": GatherClusterIngress,
-	"proxies": GatherClusterProxy,
+	"pdbs":                         GatherPodDisruptionBudgets,
+	"metrics":                      GatherMostRecentMetrics,
+	"operators":                    GatherClusterOperators,
+	"container_images":             GatherContainerImages,
+	"nodes":                        GatherNodes,
+	"config_maps":                  GatherConfigMaps,
+	"version":                      GatherClusterVersion,
+	"id":                           GatherClusterID,
+	"infrastructures":              GatherClusterInfrastructure,
+	"networks":                     GatherClusterNetwork,
+	"authentication":               GatherClusterAuthentication,
+	"image_registries":             GatherClusterImageRegistry,
+	"image_pruners":                GatherClusterImagePruner,
+	"feature_gates":                GatherClusterFeatureGates,
+	"oauths":                       GatherClusterOAuth,
+	"ingress":                      GatherClusterIngress,
+	"proxies":                      GatherClusterProxy,
 	"certificate_signing_requests": GatherCertificateSigningRequests,
-	"crds": GatherCRD,
-	"host_subnets": GatherHostSubnet,
-	"machine_sets": GatherMachineSet,
-	"install_plans": GatherInstallPlans,
-	"service_accounts": GatherServiceAccounts,
-	"machine_config_pools": GatherMachineConfigPool,
-	"container_runtime_configs": GatherContainerRuntimeConfig,
-	"stateful_sets": GatherStatefulSets,
-	"netnamespaces": GatherNetNamespace,
+	"crds":                         GatherCRD,
+	"host_subnets":                 GatherHostSubnet,
+	"machine_sets":                 GatherMachineSet,
+	"install_plans":                GatherInstallPlans,
+	"service_accounts":             GatherServiceAccounts,
+	"machine_config_pools":         GatherMachineConfigPool,
+	"container_runtime_configs":    GatherContainerRuntimeConfig,
+	"stateful_sets":                GatherStatefulSets,
+	"netnamespaces":                GatherNetNamespace,
 }
 
 // New creates new Gatherer
@@ -144,22 +144,22 @@ func uniqueStrings(list []string) []string {
 	if len(list) < 2 {
 		return list
 	}
-    keys := make(map[string]bool)
-    set := []string{}
-    for _, entry := range list {
-        if _, value := keys[entry]; !value {
-            keys[entry] = true
-            set = append(set, entry)
-        }
-    }
-    return set
+	keys := make(map[string]bool)
+	set := []string{}
+	for _, entry := range list {
+		if _, value := keys[entry]; !value {
+			keys[entry] = true
+			set = append(set, entry)
+		}
+	}
+	return set
 }
 
 func contains(s []string, e string) bool {
-    for _, a := range s {
-        if a == e {
-            return true
-        }
-    }
-    return false
-}
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}

pkg/gather/clusterconfig/0_gatherer.go

@@ -13,7 +13,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 

pkg/gather/clusterconfig/certificate_signing_requests.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/insights-operator/pkg/record"
 	"github.com/openshift/insights-operator/pkg/utils"

pkg/gather/clusterconfig/config_maps_test.go

@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 

pkg/gather/clusterconfig/container_images.go

@@ -20,7 +20,9 @@ metadata:
     name: test-ContainerRC
 `
 	gvr := schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"}
-	client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+		gvr: "ContainerRuntimeConfigsList",
+	})
 	decUnstructured := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
 	testContainerRuntimeConfigs := &unstructured.Unstructured{}

pkg/gather/clusterconfig/container_runtime_configs_test.go

@@ -7,7 +7,7 @@ import (
 	apixv1beta1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 

pkg/gather/clusterconfig/custom_resource_definitions.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	registryv1 "github.com/openshift/api/imageregistry/v1"
 	imageregistryv1client "github.com/openshift/client-go/imageregistry/clientset/versioned"

pkg/gather/clusterconfig/image_pruners.go

@@ -8,7 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	registryv1 "github.com/openshift/api/imageregistry/v1"
 	imageregistryv1client "github.com/openshift/client-go/imageregistry/clientset/versioned"

pkg/gather/clusterconfig/image_registries.go

@@ -52,7 +52,7 @@ func TestGatherInstallPlans(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+			var client *dynamicfake.FakeDynamicClient
 			coreClient := kubefake.NewSimpleClientset()
 			for _, file := range test.testfiles {
 				f, err := os.Open(file)
@@ -86,6 +86,11 @@ func TestGatherInstallPlans(t *testing.T) {
 				if err != nil {
 					t.Fatal("unable to create ns fake ", err)
 				}
+				if client == nil {
+					client = dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+						gvr: "InstallPlansList",
+					})
+				}
 				_, err = client.Resource(gvr).Namespace(ns).Create(context.Background(), installplan, metav1.CreateOptions{})
 				if err != nil {
 					t.Fatal("unable to create installplan fake ", err)

pkg/gather/clusterconfig/install_plans_test.go

@@ -20,7 +20,9 @@ metadata:
     name: master-t
 `
 	gvr := schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigpools"}
-	client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+		gvr: "MachineConfigPoolsList",
+	})
 	decUnstructured := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
 	testMachineConfigPools := &unstructured.Unstructured{}

pkg/gather/clusterconfig/machine_config_pools_test.go

@@ -20,7 +20,9 @@ metadata:
     name: test-worker
 `
 	gvr := schema.GroupVersionResource{Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinesets"}
-	client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+		gvr: "MachineSetsList",
+	})
 	decUnstructured := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
 	testMachineSet := &unstructured.Unstructured{}

pkg/gather/clusterconfig/machine_sets_test.go

@@ -17,7 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"

pkg/gather/clusterconfig/operators.go

@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 
 	"k8s.io/client-go/rest"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/insights-operator/pkg/record"
 )

pkg/gather/clusterconfig/recent_metrics.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/client-go/kubernetes"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 

pkg/gather/clusterconfig/service_accounts.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	appsclient "k8s.io/client-go/kubernetes/typed/apps/v1"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	appsv1 "k8s.io/api/apps/v1"
 	_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"