Merge pull request #121 from jmencak/k1.18

Kube 1.18 rebase (library-go, api, client-go)

go.mod

@@ -3,21 +3,47 @@ module github.com/openshift/cluster-node-tuning-operator
 go 1.13
 
 require (
+	github.com/emicklei/go-restful v2.9.6+incompatible // indirect
 	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
-	github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
-	github.com/googleapis/gnostic v0.3.1 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
+	github.com/googleapis/gnostic v0.3.0 // indirect
 	github.com/kevinburke/go-bindata v3.16.0+incompatible
-	github.com/openshift/api v0.0.0-20191217141120-791af96035a5
-	github.com/openshift/client-go v0.0.0-20191216194936-57f413491e9e
+	github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
+	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
 	github.com/openshift/crd-schema-gen v1.0.0
-	github.com/openshift/library-go v0.0.0-20200106191802-9821002633e8
-	gopkg.in/yaml.v2 v2.2.4
-	// kubernetes-1.17
-	k8s.io/api v0.17.0
-	k8s.io/apimachinery v0.17.1-beta.0
-	k8s.io/client-go v0.17.0
-	k8s.io/code-generator v0.17.0
+	github.com/openshift/library-go v0.0.0-20200331103725-0ea6ba4792fa
+	gopkg.in/yaml.v2 v2.2.8
+
+	k8s.io/api v0.18.0
+	k8s.io/apimachinery v0.18.0
+	k8s.io/client-go v0.18.0
+	k8s.io/code-generator v0.18.0
 	k8s.io/klog v1.0.0
 	sigs.k8s.io/controller-tools v0.2.2 // indirect
 )
+
+// Pinned to kubernetes-1.18.0
+replace (
+	k8s.io/api => k8s.io/api v0.18.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
+	k8s.io/apiserver => k8s.io/apiserver v0.18.0
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
+	k8s.io/client-go => k8s.io/client-go v0.18.0
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
+	k8s.io/code-generator => k8s.io/code-generator v0.18.0
+	k8s.io/component-base => k8s.io/component-base v0.18.0
+	k8s.io/cri-api => k8s.io/cri-api v0.18.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
+	k8s.io/kubectl => k8s.io/kubectl v0.18.0
+	k8s.io/kubelet => k8s.io/kubelet v0.18.0
+	k8s.io/kubernetes => k8s.io/kubernetes v1.18.0
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
+	k8s.io/metrics => k8s.io/metrics v0.18.0
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
+)