From f27197b483860c374232e1bdd9294f3072e2ce45 Mon Sep 17 00:00:00 2001
From: jharrington22 <james@harrington.net.au>
Date: Thu, 11 Jun 2020 13:47:29 -0400
Subject: [PATCH] Update Makefile for CI and remove PR check script

---
 Makefile    |  6 +++++-
 OWNERS      | 14 ++++++++++++++
 go.mod      |  1 +
 go.sum      |  2 ++
 pr_check.sh | 29 -----------------------------
 5 files changed, 22 insertions(+), 30 deletions(-)
 create mode 100644 OWNERS
 delete mode 100755 pr_check.sh

diff --git a/Makefile b/Makefile
index 4cb070fe8b..9cb52cfeba 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,10 @@ export GOPROXY=https://proxy.golang.org
 # Disable CGO so that we always generate static binaries:
 export CGO_ENABLED=0
 
-.PHONY: moactl
+# Unset GOFLAG for CI and ensure we've got nothing accidently set
+unexport GOFLAGS
+
+.PHONY: build
 moactl: generate
 	go build .
 
@@ -49,6 +52,7 @@ clean:
 
 .PHONY: generate
 generate:
+	go get github.com/go-bindata/go-bindata/...
 	go-bindata -nometadata -nocompress -pkg assets -o ./assets/bindata.go ./templates/...
 
 .PHONY: docs
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000000..413b713b12
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,14 @@
+reviewers:
+- jharrington22
+- vkareh 
+- igoihman
+- jeremyeder 
+- NautiluX 
+approvers:
+- jharrington22
+- vkareh 
+- igoihman
+- jeremyeder 
+maintainers:
+- jharrington22
+- vkareh 
diff --git a/go.mod b/go.mod
index 2525315041..3246a29685 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/aws/aws-sdk-go v1.29.17
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dustin/go-humanize v1.0.0
+	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/mock v1.4.3
 	github.com/mattn/go-colorable v0.1.7 // indirect
diff --git a/go.sum b/go.sum
index eada245e53..9d11eae01d 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,8 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE=
+github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
diff --git a/pr_check.sh b/pr_check.sh
deleted file mode 100755
index 905e96ee50..0000000000
--- a/pr_check.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -ex
-#
-# Copyright (c) 2020 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This script is executed by a Jenkins job for each change request. If it
-# doesn't succeed the change won't be merged.
-
-# Set the `GOBIN` environment variable so that dependencies will be installed
-# always in the same place, regardless of the value of `GOPATH`:
-export GOBIN="${PWD}/.gobin"
-export PATH="${GOBIN}:${PATH}"
-
-# Run the checks:
-make \
-  moactl \
-  lint