Skip to content

Commit 5a56e37

Browse files
dhaiducekopenshift-merge-bot[bot]
authored andcommitted
Upgrade common Makefile
Signed-off-by: Dale Haiducek <[email protected]>
1 parent db2fed6 commit 5a56e37

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
PWD := $(shell pwd)
1717
LOCAL_BIN ?= $(PWD)/bin
1818

19-
# Keep an existing GOPATH, make a private one if it is undefined
20-
GOPATH_DEFAULT := $(PWD)/.go
21-
export GOPATH ?= $(GOPATH_DEFAULT)
22-
GOBIN_DEFAULT := $(GOPATH)/bin
23-
export GOBIN ?= $(GOBIN_DEFAULT)
24-
export PATH := $(LOCAL_BIN):$(GOBIN):$(PATH)
19+
export PATH := $(LOCAL_BIN):$(PATH)
2520
GOARCH = $(shell go env GOARCH)
2621
GOOS = $(shell go env GOOS)
2722
TESTARGS_DEFAULT := -v

build/common/Makefile.common.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33

44
## CLI versions (with links to the latest releases)
55
# https://github.com/kubernetes-sigs/controller-tools/releases/latest
6-
CONTROLLER_GEN_VERSION := v0.6.1
6+
CONTROLLER_GEN_VERSION := v0.14.0
77
# https://github.com/kubernetes-sigs/kustomize/releases/latest
88
KUSTOMIZE_VERSION := v5.3.0
99
# https://github.com/golangci/golangci-lint/releases/latest
1010
GOLANGCI_VERSION := v1.52.2
1111
# https://github.com/mvdan/gofumpt/releases/latest
1212
GOFUMPT_VERSION := v0.6.0
1313
# https://github.com/daixiang0/gci/releases/latest
14-
GCI_VERSION := v0.12.1
14+
GCI_VERSION := v0.12.3
1515
# https://github.com/securego/gosec/releases/latest
16-
GOSEC_VERSION := v2.18.2
16+
GOSEC_VERSION := v2.19.0
1717
# https://github.com/kubernetes-sigs/kubebuilder/releases/latest
18-
KBVERSION := 3.12.0
18+
KBVERSION := 3.14.0
1919
# https://github.com/kubernetes/kubernetes/releases/latest
20-
ENVTEST_K8S_VERSION := 1.26.x
20+
ENVTEST_K8S_VERSION := 1.29.x
2121

2222
LOCAL_BIN ?= $(error LOCAL_BIN is not set.)
2323
ifneq ($(findstring $(LOCAL_BIN), $(PATH)), $(LOCAL_BIN))

deploy/operator.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ rules:
3333
apiVersion: rbac.authorization.k8s.io/v1
3434
kind: ClusterRole
3535
metadata:
36-
creationTimestamp: null
3736
name: governance-policy-framework-addon
3837
rules:
3938
- apiGroups:

deploy/rbac/role.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole
54
metadata:
6-
creationTimestamp: null
75
name: governance-policy-framework-addon
86
rules:
97
- apiGroups:

0 commit comments

Comments
 (0)