Skip to content

Commit 1ab78cc

Browse files
authored
Bumping to k8s 1.25 (#109)
* Bumping to k8s 1.25 & go 1.19 Signed-off-by: jesus m. rodriguez <[email protected]> * Bump ci to go 1.19 Signed-off-by: jesus m. rodriguez <[email protected]> * Bump golangci-lint & fix linter errors Signed-off-by: jesus m. rodriguez <[email protected]> * Setup go for lint call. The github action with the newer linter needs go setup for it to run properly. Signed-off-by: jesus m. rodriguez <[email protected]> * Remove deprecated -i flag from go build Signed-off-by: jesus m. rodriguez <[email protected]> * Use setup-go v3 gh action Signed-off-by: jesus m. rodriguez <[email protected]>
1 parent 58f9b32 commit 1ab78cc

File tree

8 files changed

+111
-454
lines changed

8 files changed

+111
-454
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
steps:
1515

1616
- name: Set up Go 1.x
17-
uses: actions/setup-go@v2
17+
uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.17.x
19+
go-version: 1.19.x
2020
id: go
2121

2222
- name: Check out code into the Go module directory
@@ -46,13 +46,18 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848

49+
- name: Set up Go 1.x
50+
uses: actions/setup-go@v3
51+
with:
52+
go-version: 1.19.x
53+
4954
- name: Check out code into the Go module directory
5055
uses: actions/checkout@v2
5156

5257
- name: Run golangci-lint
5358
uses: golangci/golangci-lint-action@v3
5459
with:
55-
version: v1.29
60+
version: v1.49
5661
args: --timeout 5m
5762

5863
go-apidiff:
@@ -62,9 +67,9 @@ jobs:
6267
steps:
6368

6469
- name: Set up Go 1.x
65-
uses: actions/setup-go@v2
70+
uses: actions/setup-go@v3
6671
with:
67-
go-version: ^1.17
72+
go-version: ^1.19
6873
id: go
6974

7075
- name: Check out code into the Go module directory

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SOURCES := $(shell find . -name '*.go' -not -path "*/vendor/*" -not -pa
22
.DEFAULT_GOAL := build
33

44
build: $(SOURCES) ## Build Test
5-
go build -i -ldflags="-s -w" ./...
5+
go build -ldflags="-s -w" ./...
66

77
lint: golangci-lint ## Run golangci-lint
88
@$(GOLANGCI_LINT) run
@@ -35,7 +35,7 @@ clean: ## Clean up your working environment
3535
@rm -f cover.out
3636

3737
GOLANGCI_LINT=./bin/golangci-lint
38-
GOLANGCI_LINT_VER=1.30.0
38+
GOLANGCI_LINT_VER=1.49.0
3939
golangci-lint:
4040
ifneq ($(GOLANGCI_LINT_VER), $(shell $(GOLANGCI_LINT) version 2>&1 | cut -d" " -f4))
4141
@{ \

go.mod

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
module github.com/operator-framework/operator-lib
22

3-
go 1.17
3+
go 1.19
44

55
require (
6-
github.com/go-logr/logr v1.2.0
6+
github.com/go-logr/logr v1.2.3
77
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.18.1
9-
github.com/operator-framework/api v0.15.0
10-
github.com/prometheus/client_golang v1.12.1
8+
github.com/onsi/gomega v1.19.0
9+
github.com/operator-framework/api v0.14.0
10+
github.com/prometheus/client_golang v1.12.2
1111
github.com/prometheus/client_model v0.2.0
12-
k8s.io/api v0.24.0
13-
k8s.io/apimachinery v0.24.0
14-
k8s.io/client-go v0.24.0
15-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
16-
sigs.k8s.io/controller-runtime v0.12.1
12+
k8s.io/api v0.25.0
13+
k8s.io/apimachinery v0.25.0
14+
k8s.io/client-go v0.25.0
15+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
16+
sigs.k8s.io/controller-runtime v0.13.0
1717
)
1818

1919
require (
@@ -22,17 +22,18 @@ require (
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2424
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
25+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
2626
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
27-
github.com/fsnotify/fsnotify v1.5.1 // indirect
27+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
28+
github.com/fsnotify/fsnotify v1.5.4 // indirect
2829
github.com/go-openapi/jsonpointer v0.19.5 // indirect
2930
github.com/go-openapi/jsonreference v0.19.5 // indirect
3031
github.com/go-openapi/swag v0.19.14 // indirect
3132
github.com/gogo/protobuf v1.3.2 // indirect
3233
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3334
github.com/golang/protobuf v1.5.2 // indirect
3435
github.com/google/gnostic v0.5.7-v3refs // indirect
35-
github.com/google/go-cmp v0.5.6 // indirect
36+
github.com/google/go-cmp v0.5.8 // indirect
3637
github.com/google/gofuzz v1.1.0 // indirect
3738
github.com/google/uuid v1.1.2 // indirect
3839
github.com/imdario/mergo v0.3.12 // indirect
@@ -48,24 +49,24 @@ require (
4849
github.com/prometheus/common v0.32.1 // indirect
4950
github.com/prometheus/procfs v0.7.3 // indirect
5051
github.com/spf13/pflag v1.0.5 // indirect
51-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
52+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
5253
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
53-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
54+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
5455
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
5556
golang.org/x/text v0.3.7 // indirect
56-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
57+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
5758
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
5859
google.golang.org/appengine v1.6.7 // indirect
59-
google.golang.org/protobuf v1.27.1 // indirect
60+
google.golang.org/protobuf v1.28.0 // indirect
6061
gopkg.in/inf.v0 v0.9.1 // indirect
6162
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6263
gopkg.in/yaml.v2 v2.4.0 // indirect
63-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
64-
k8s.io/apiextensions-apiserver v0.24.0 // indirect
65-
k8s.io/component-base v0.24.0 // indirect
66-
k8s.io/klog/v2 v2.60.1 // indirect
67-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
68-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
69-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
64+
gopkg.in/yaml.v3 v3.0.1 // indirect
65+
k8s.io/apiextensions-apiserver v0.25.0 // indirect
66+
k8s.io/component-base v0.25.0 // indirect
67+
k8s.io/klog/v2 v2.70.1 // indirect
68+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
69+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
70+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7071
sigs.k8s.io/yaml v1.3.0 // indirect
7172
)

0 commit comments

Comments
 (0)