Merge pull request #82 from jmrodri/trytryagain-removal-job

Re-add service catalog apiserver removal job

.gitignore

@@ -0,0 +1,3 @@
+/cluster-svcat-apiserver-remover
+.idea/
+.vscode/

Dockerfile

@@ -1,10 +1,9 @@
-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/cluster-svcat-apiserver-operator
 COPY . .
-RUN GODEBUG=tls13=1 go build ./cmd/cluster-svcat-apiserver-operator
+RUN make build --warn-undefined-variables
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-COPY --from=builder /go/src/github.com/openshift/cluster-svcat-apiserver-operator/cluster-svcat-apiserver-operator /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/cluster-svcat-apiserver-operator/cluster-svcat-apiserver-remover /usr/bin/
 COPY manifests /manifests
-COPY vendor/github.com/openshift/api/operator/v1/0000_50_cluster-svcat-apiserver-operator_02_config.crd.yaml /manifests
 LABEL io.openshift.release.operator true

Dockerfile.rhel7

@@ -1,10 +1,9 @@
-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/cluster-svcat-apiserver-operator
 COPY . .
-RUN go build ./cmd/cluster-svcat-apiserver-operator
+RUN make build --warn-undefined-variables
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
-COPY --from=builder /go/src/github.com/openshift/cluster-svcat-apiserver-operator/cluster-svcat-apiserver-operator /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/cluster-svcat-apiserver-operator/cluster-svcat-apiserver-remover /usr/bin/
 COPY manifests /manifests
-COPY vendor/github.com/openshift/api/operator/v1/0000_50_cluster-svcat-apiserver-operator_02_config.crd.yaml /manifests
 LABEL io.openshift.release.operator true

Makefile

@@ -1,39 +1,47 @@
-all: build
+IMAGE ?= docker.io/openshift/origin-cluster-svcat-apiserver-operator
+TAG ?= latest
+PROG  := cluster-svcat-apiserver-remover
+REPO_PATH:= github.com/openshift/cluster-svcat-apiserver-operator
+GO_LD_FLAGS := -ldflags "-X '${REPO_PATH}/pkg/version.SourceGitCommit=$(shell git rev-parse HEAD)'"
+SOURCES := $(shell find . -name '*.go' -not -path "*/vendor/*")
+GOFLAGS := -mod=vendor
+
+all: build build-image verify
 .PHONY: all
+build:
+	GODEBUG=tls13=1 go build ${GO_LD_FLAGS} ./cmd/cluster-svcat-apiserver-remover
+.PHONY: build
 
-# Include the library makefile
-include $(addprefix ./vendor/github.com/openshift/library-go/alpha-build-machinery/make/, \
-	golang.mk \
-	targets/openshift/bindata.mk \
-	targets/openshift/deps.mk \
-	targets/openshift/images.mk \
-)
-
-# This will call a macro called "build-image" which will generate image specific targets based on the parameters:
-# $0 - macro name
-# $1 - target name
-# $2 - image ref
-# $3 - Dockerfile path
-# $4 - context directory for image build
-$(call build-image,ocp-cluster-svcat-apiserver-operator,registry.svc.ci.openshift.org/ocp/4.3:cluster-svcat-apiserver-operator,./Dockerfile,.)
-
-# This will call a macro called "add-bindata" which will generate bindata specific targets based on the parameters:
-# $0 - macro name
-# $1 - target suffix
-# $2 - input dirs
-# $3 - prefix
-# $4 - pkg
-# $5 - output
-# It will generate targets {update,verify}-bindata-$(1) logically grouping them in unsuffixed versions of these targets
-# and also hooked into {update,verify}-generated for broader integration.
-$(call add-bindata,v3.11.0,./bindata/v3.11.0/...,bindata,v311_00_assets,pkg/operator/v311_00_assets/bindata.go)
+image:
+	docker build -t "$(IMAGE):$(TAG)" .
+.PHONY: build-image
 
+test: test-unit test-e2e
+.PHONY: test
 
-clean:
-	$(RM) ./cluster-svcat-apiserver-operator
-.PHONY: clean
-GO_TEST_PACKAGES :=./pkg/... ./cmd/...
+test-unit:
+ifndef JUNITFILE
+	go test $(GO_LD_FLAGS) -race ./...
+else
+ifeq (, $(shell which gotest2junit 2>/dev/null))
+$(error gotest2junit not found! Get it by `go get -u github.com/openshift/release/tools/gotest2junit`.)
+endif
+	go test $(GO_LD_FLAGS) -race -json ./... | gotest2junit > $(JUNITFILE)
+endif
+.PHONY: test-unit
 
+test-e2e:
+	go test -v ./test/e2e/...
 .PHONY: test-e2e
-test-e2e: GO_TEST_PACKAGES :=./test/e2e/...
-test-e2e: test-unit
+
+verify: verify-govet
+	@gofmt -l $(SOURCES) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
+.PHONY: verify
+
+verify-govet:
+	go vet $(GO_LD_FLAGS) ./...
+.PHONY: verify-govet
+
+clean:
+	rm -f $(PROG)
+.PHONY: clean