Bumping k8s dependencies to 1.18.3

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 AS builder
 WORKDIR /go/src/github.com/openshift/openshift-state-metrics
 COPY . .
 RUN make build

go.mod

@@ -1,23 +1,34 @@
 module github.com/openshift/openshift-state-metrics
 
-go 1.12
+go 1.14
 
 require (
-	github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1 // indirect
+	github.com/Azure/go-autorest/autorest v0.11.2 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/matttproud/golang_protobuf_extensions v0.0.0-20150406173934-fc2b8d3a73c4 // indirect
-	github.com/openshift/api v0.0.0-20180830153656-5ad8479f64f1
-	github.com/openshift/client-go v0.0.0-20180830153425-431ec9a26e50
-	github.com/openshift/origin v0.0.0-20190116184123-1c3e64399d20
+	github.com/gophercloud/gophercloud v0.12.0 // indirect
+	github.com/imdario/mergo v0.3.10 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/openshift/api v0.0.0-20200623075207-eb651a5bb0ad
+	github.com/openshift/client-go v0.0.0-20200623090625-83993cebb5ae
+	github.com/openshift/origin v4.1.0+incompatible
 	github.com/prometheus/client_golang v0.0.0-20170531130054-e7e903064f5e
 	github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
 	github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa // indirect
 	github.com/prometheus/procfs v0.0.0-20170519190837-65c1f6f8f0fc // indirect
-	github.com/spf13/pflag v1.0.3
-	golang.org/x/net v0.0.0-20190613194153-d28f0bde5980
-	k8s.io/api v0.0.0-20190703205437-39734b2a72fe
-	k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76
-	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
+	github.com/spf13/pflag v1.0.5
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
+	k8s.io/api v0.18.6
+	k8s.io/apimachinery v0.18.6
+	k8s.io/client-go v11.0.0+incompatible
 	k8s.io/kube-state-metrics v0.0.0-20190129120824-7bfed92869b6
-	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
+	k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc // indirect
+)
+
+replace (
+	k8s.io/api => k8s.io/api v0.18.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.3
+	k8s.io/client-go => k8s.io/client-go v0.18.3
 )

pkg/collectors/build.go

@@ -1,6 +1,8 @@
 package collectors
 
 import (
+	"context"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
@@ -9,7 +11,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/openshift/api/build/v1"
+	v1 "github.com/openshift/api/build/v1"
 )
 
 var (
@@ -156,10 +158,10 @@ func createBuildListWatch(apiserver string, kubeconfig string, ns string) cache.
 	}
 	return cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return buildclient.BuildV1().Builds(ns).List(opts)
+			return buildclient.BuildV1().Builds(ns).List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return buildclient.BuildV1().Builds(ns).Watch(opts)
+			return buildclient.BuildV1().Builds(ns).Watch(context.TODO(), opts)
 		},
 	}
 }

pkg/collectors/build_config.go

@@ -1,6 +1,8 @@
 package collectors
 
 import (
+	"context"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
@@ -11,7 +13,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/openshift/api/build/v1"
+	v1 "github.com/openshift/api/build/v1"
 	buildclient "github.com/openshift/client-go/build/clientset/versioned"
 )
 
@@ -110,10 +112,10 @@ func createBuildConfigListWatch(apiserver string, kubeconfig string, ns string)
 	}
 	return cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return buildclient.BuildV1().BuildConfigs(ns).List(opts)
+			return buildclient.BuildV1().BuildConfigs(ns).List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return buildclient.BuildV1().BuildConfigs(ns).Watch(opts)
+			return buildclient.BuildV1().BuildConfigs(ns).Watch(context.TODO(), opts)
 		},
 	}
 }

pkg/collectors/cluster_resource_quota.go

@@ -1,6 +1,7 @@
 package collectors
 
 import (
+	"context"
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -11,7 +12,7 @@ import (
 	"k8s.io/kube-state-metrics/pkg/metric"
 
 	"github.com/golang/glog"
-	"github.com/openshift/api/quota/v1"
+	v1 "github.com/openshift/api/quota/v1"
 	quotaclient "github.com/openshift/client-go/quota/clientset/versioned"
 	"k8s.io/kube-state-metrics/pkg/version"
 )
@@ -176,10 +177,10 @@ func createClusterResourceQuotaListWatch(apiserver string, kubeconfig string, ns
 	}
 	return cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return quotaclient.QuotaV1().ClusterResourceQuotas().List(opts)
+			return quotaclient.QuotaV1().ClusterResourceQuotas().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return quotaclient.QuotaV1().ClusterResourceQuotas().Watch(opts)
+			return quotaclient.QuotaV1().ClusterResourceQuotas().Watch(context.TODO(), opts)
 		},
 	}
 }

pkg/collectors/deployment_config.go

@@ -1,6 +1,8 @@
 package collectors
 
 import (
+	"context"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -12,7 +14,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/openshift/api/apps/v1"
+	v1 "github.com/openshift/api/apps/v1"
 	appsclient "github.com/openshift/client-go/apps/clientset/versioned"
 )
 
@@ -216,10 +218,10 @@ func createDeploymentListWatch(apiserver string, kubeconfig string, ns string) c
 	}
 	return cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return appsclient.AppsV1().DeploymentConfigs(ns).List(opts)
+			return appsclient.AppsV1().DeploymentConfigs(ns).List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return appsclient.AppsV1().DeploymentConfigs(ns).Watch(opts)
+			return appsclient.AppsV1().DeploymentConfigs(ns).Watch(context.TODO(), opts)
 		},
 	}
 }

pkg/collectors/group.go

@@ -1,6 +1,8 @@
 package collectors
 
 import (
+	"context"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
@@ -11,7 +13,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/openshift/api/user/v1"
+	v1 "github.com/openshift/api/user/v1"
 	groupclient "github.com/openshift/client-go/user/clientset/versioned"
 )
 
@@ -81,10 +83,10 @@ func createGroupListWatch(apiserver string, kubeconfig string, ns string) cache.
 	}
 	return cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return groupclient.UserV1().Groups().List(opts)
+			return groupclient.UserV1().Groups().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return groupclient.UserV1().Groups().Watch(opts)
+			return groupclient.UserV1().Groups().Watch(context.TODO(), opts)
 		},
 	}
 }

pkg/collectors/route.go

@@ -1,6 +1,7 @@
 package collectors
 
 import (
+	"context"
 	"strconv"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -132,10 +133,10 @@ func createRouteListWatch(apiserver string, kubeconfig string, ns string) cache.
 	}
 	return cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return routesclient.RouteV1().Routes(ns).List(opts)
+			return routesclient.RouteV1().Routes(ns).List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return routesclient.RouteV1().Routes(ns).Watch(opts)
+			return routesclient.RouteV1().Routes(ns).Watch(context.TODO(), opts)
 		},
 	}
 }