Merge pull request #37 from sttts/sttts-bump-golang-x-text

Bug 1855628: bump golang.com/x/text and switch to go-mod and build-machinery

Makefile

@@ -2,19 +2,20 @@ all: build
 .PHONY: all
 
 # Include the library makefile
-include $(addprefix ./vendor/github.com/openshift/library-go/alpha-build-machinery/make/, \
+include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
 	golang.mk \
+	targets/openshift/deps-gomod.mk \
 	targets/openshift/images.mk \
-	targets/openshift/deps.mk \
 )
 
+$(call build-image,origin-$(GO_PACKAGE),./Dockerfile,.)
 # This will call a macro called "build-image" which will generate image specific targets based on the parameters:
 # $0 - macro name
-# $1 - target suffix
-# $2 - Dockerfile path
-# $3 - context directory for image build
-# It will generate target "image-$(1)" for builing the image an binding it as a prerequisite to target "images".
-$(call build-image,origin-$(GO_PACKAGE),./Dockerfile,.)
+# $1 - target name
+# $2 - image ref
+# $3 - Dockerfile path
+# $4 - context directory for image build
+$(call build-image,ocp-cluster-bootstrap,$(IMAGE_REGISTRY)/ocp/4.2:cluster-bootstrap,./Dockerfile.rhel7,.)
 
 clean:
 	$(RM) ./cluster-bootstrap

cmd/cluster-bootstrap/log.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 type GlogWriter struct{}

go.mod

@@ -0,0 +1,17 @@
+module github.com/openshift/cluster-bootstrap
+
+go 1.13
+
+require (
+	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/googleapis/gnostic v0.5.1 // indirect
+	github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
+	github.com/openshift/library-go v0.0.0-20200930190915-f7cb85f605db
+	github.com/spf13/cobra v1.0.0
+	github.com/stretchr/testify v1.6.1 // indirect
+	k8s.io/api v0.19.2
+	k8s.io/apimachinery v0.19.2
+	k8s.io/client-go v0.19.2
+	k8s.io/klog/v2 v2.3.0
+)