BUG 1816624: MHC structural schema

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
 WORKDIR /go/src/github.com/openshift/machine-api-operator
 COPY . .
 RUN NO_DOCKER=1 make build

Dockerfile.rhel7

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
 WORKDIR /go/src/github.com/openshift/machine-api-operator
 COPY . .
 RUN NO_DOCKER=1 make build

Makefile

@@ -24,7 +24,7 @@ ifeq ($(NO_DOCKER), 1)
   DOCKER_CMD =
   IMAGE_BUILD_CMD = imagebuilder
 else
-  DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.12
+  DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.13
   IMAGE_BUILD_CMD = docker build
 endif
 

cmd/machine-api-operator/start.go

@@ -13,9 +13,9 @@ import (
 	"github.com/openshift/machine-api-operator/pkg/metrics"
 	"github.com/openshift/machine-api-operator/pkg/operator"
 	"github.com/openshift/machine-api-operator/pkg/version"
-	"github.com/spf13/cobra"
-
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/spf13/cobra"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
@@ -151,8 +151,7 @@ func startMetricsCollectionAndServer(ctx *ControllerContext) {
 
 func startHTTPMetricServer(metricsPort string) {
 	mux := http.NewServeMux()
-	//TODO(vikasc): Use promhttp package for handler. This is Deprecated
-	mux.Handle("/metrics", prometheus.Handler())
+	mux.Handle("/metrics", promhttp.Handler())
 
 	server := &http.Server{
 		Addr:    metricsPort,

go.mod

@@ -1,70 +1,41 @@
 module github.com/openshift/machine-api-operator
 
-go 1.12
+go 1.13
 
 require (
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
 	github.com/google/uuid v1.1.1
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/imdario/mergo v0.3.8 // indirect
-	github.com/openshift/api v0.0.0-20200127192224-ffde1bfabb9f
-	github.com/openshift/client-go v0.0.0-20190617165122-8892c0adc000
-	github.com/openshift/cluster-version-operator v3.11.1-0.20190629164025-08cac1c02538+incompatible
+	github.com/openshift/api v0.0.0-20200323095748-e7041f8762a3
+	github.com/openshift/client-go v0.0.0-20200320150128-a906f3d8e723
+	github.com/openshift/library-go v0.0.0-20200324092245-db2a8546af81
 	github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b
 	github.com/pkg/errors v0.8.1
-	github.com/prometheus/client_golang v1.0.0
-	github.com/prometheus/common v0.6.0 // indirect
+	github.com/prometheus/client_golang v1.1.0
+	github.com/prometheus/common v0.7.0 // indirect
 	github.com/prometheus/procfs v0.0.5 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.4.0
 	github.com/vmware/govmomi v0.21.0
-	go.uber.org/atomic v1.4.0 // indirect
-	go.uber.org/zap v1.10.0 // indirect
-	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
-	golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
-	gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 // indirect
-	google.golang.org/appengine v1.6.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
+	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
+	google.golang.org/appengine v1.6.4 // indirect
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	k8s.io/api v0.17.2
-	k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604 // indirect
-	k8s.io/apimachinery v0.17.2
-	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/code-generator v0.17.2
+	k8s.io/api v0.18.0-rc.1
+	k8s.io/apimachinery v0.18.0-rc.1
+	k8s.io/client-go v0.18.0-rc.1
+	k8s.io/code-generator v0.18.0-rc.1
 	k8s.io/klog v1.0.0
-	k8s.io/kube-aggregator v0.0.0-20190404125450-f5e124c822d6 // indirect
-	k8s.io/kubectl v0.0.0-20200124035537-9f7d91504e51
-	k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc
+	k8s.io/kube-aggregator v0.18.0-rc.1 // indirect
+	k8s.io/kubectl v0.18.0-rc.1
+	k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
 	sigs.k8s.io/controller-runtime v0.3.1-0.20191016212439-2df793d02076
-	sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
-	sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4 // indirect
-	sigs.k8s.io/yaml v1.1.0
+	sigs.k8s.io/controller-tools v0.2.8
+	sigs.k8s.io/yaml v1.2.0
 )
 
-replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
-
-replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
-
-replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
-
-// pinning to kubernetes-1.16.0
-
-replace k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
-
-// Pinning to origin-4.3-kubernetes-1.16.0
-
-replace k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
-
-replace k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20190913080033-27d36303b655
-
-replace k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20190918160344-1fbdaa4c8d90
-
-replace k8s.io/kube-aggregator => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
+replace sigs.k8s.io/controller-runtime => github.com/munnerz/controller-runtime v0.1.8-0.20200318092001-e22ac1073450