Skip to content

Commit

Permalink
Upgrade common Makefile
Browse files Browse the repository at this point in the history
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
  • Loading branch information
dhaiducek authored and openshift-merge-bot[bot] committed Feb 26, 2024
1 parent db2fed6 commit 5a56e37
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@
PWD := $(shell pwd)
LOCAL_BIN ?= $(PWD)/bin

# Keep an existing GOPATH, make a private one if it is undefined
GOPATH_DEFAULT := $(PWD)/.go
export GOPATH ?= $(GOPATH_DEFAULT)
GOBIN_DEFAULT := $(GOPATH)/bin
export GOBIN ?= $(GOBIN_DEFAULT)
export PATH := $(LOCAL_BIN):$(GOBIN):$(PATH)
export PATH := $(LOCAL_BIN):$(PATH)
GOARCH = $(shell go env GOARCH)
GOOS = $(shell go env GOOS)
TESTARGS_DEFAULT := -v
Expand Down
10 changes: 5 additions & 5 deletions build/common/Makefile.common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

## CLI versions (with links to the latest releases)
# https://github.com/kubernetes-sigs/controller-tools/releases/latest
CONTROLLER_GEN_VERSION := v0.6.1
CONTROLLER_GEN_VERSION := v0.14.0
# https://github.com/kubernetes-sigs/kustomize/releases/latest
KUSTOMIZE_VERSION := v5.3.0
# https://github.com/golangci/golangci-lint/releases/latest
GOLANGCI_VERSION := v1.52.2
# https://github.com/mvdan/gofumpt/releases/latest
GOFUMPT_VERSION := v0.6.0
# https://github.com/daixiang0/gci/releases/latest
GCI_VERSION := v0.12.1
GCI_VERSION := v0.12.3
# https://github.com/securego/gosec/releases/latest
GOSEC_VERSION := v2.18.2
GOSEC_VERSION := v2.19.0
# https://github.com/kubernetes-sigs/kubebuilder/releases/latest
KBVERSION := 3.12.0
KBVERSION := 3.14.0
# https://github.com/kubernetes/kubernetes/releases/latest
ENVTEST_K8S_VERSION := 1.26.x
ENVTEST_K8S_VERSION := 1.29.x

LOCAL_BIN ?= $(error LOCAL_BIN is not set.)
ifneq ($(findstring $(LOCAL_BIN), $(PATH)), $(LOCAL_BIN))
Expand Down
1 change: 0 additions & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: governance-policy-framework-addon
rules:
- apiGroups:
Expand Down
2 changes: 0 additions & 2 deletions deploy/rbac/role.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: governance-policy-framework-addon
rules:
- apiGroups:
Expand Down

0 comments on commit 5a56e37

Please sign in to comment.