Skip to content

Commit 422d542

Browse files
acornett21acornett21
authored
updating dependencies and code to support k8s 1.28 (#51)
Signed-off-by: Adam D. Cornett <[email protected]>
1 parent d76a8db commit 422d542

File tree

13 files changed

+269
-679
lines changed

13 files changed

+269
-679
lines changed

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export IMAGE_VERSION = v1.33.0
99
export SIMPLE_VERSION := $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
1010
export GIT_VERSION := $(shell git describe --dirty --tags --always)
1111
export GIT_COMMIT := $(shell git rev-parse HEAD)
12-
export K8S_VERSION = 1.27.0
13-
export ENVTEST_VERSION = 1.27.x
12+
export K8S_VERSION = 1.28.0
13+
export ENVTEST_VERSION = 1.28.x
1414

1515
# Build settings
1616
export TOOLS_DIR = tools/bin
@@ -63,7 +63,7 @@ fix: ## Fixup files in the repo.
6363

6464
.PHONY: setup-lint
6565
setup-lint: ## Setup the lint
66-
$(SCRIPTS_DIR)/fetch golangci-lint 1.51.2
66+
$(SCRIPTS_DIR)/fetch golangci-lint 1.55.2
6767

6868
.PHONY: lint
6969
lint: setup-lint ## Run the lint check
@@ -158,12 +158,12 @@ cluster-create::
158158

159159
.PHONY: dev-install
160160
dev-install::
161-
$(SCRIPTS_DIR)/fetch kind 0.17.0
161+
$(SCRIPTS_DIR)/fetch kind 0.20.0
162162
$(SCRIPTS_DIR)/fetch kubectl $(K8S_VERSION) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
163163

164164
.PHONY: test-e2e-teardown
165165
test-e2e-teardown:
166-
$(SCRIPTS_DIR)/fetch kind 0.17.0
166+
$(SCRIPTS_DIR)/fetch kind 0.20.0
167167
$(TOOLS_DIR)/kind delete cluster --name $(KIND_CLUSTER)
168168
rm -f $(KUBECONFIG)
169169

‎go.mod

Lines changed: 54 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,120 +3,109 @@ module github.com/operator-framework/ansible-operator-plugins
33
go 1.20
44

55
require (
6-
github.com/go-logr/logr v1.3.0
6+
github.com/go-logr/logr v1.4.1
77
github.com/kr/text v0.2.0
8-
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
9-
github.com/onsi/ginkgo/v2 v2.12.0
10-
github.com/onsi/gomega v1.27.10
11-
github.com/operator-framework/operator-lib v0.11.1-0.20230717184314-6efbe3a22f6f
12-
github.com/operator-framework/operator-registry v1.33.0
13-
github.com/prometheus/client_golang v1.16.0
14-
github.com/prometheus/client_model v0.4.0
8+
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
9+
github.com/onsi/ginkgo/v2 v2.14.0
10+
github.com/onsi/gomega v1.30.0
11+
github.com/operator-framework/operator-lib v0.12.0
12+
github.com/operator-framework/operator-registry v1.35.0
13+
github.com/prometheus/client_golang v1.18.0
14+
github.com/prometheus/client_model v0.5.0
1515
github.com/sirupsen/logrus v1.9.3
16-
github.com/spf13/afero v1.9.5
17-
github.com/spf13/cobra v1.7.0
16+
github.com/spf13/afero v1.11.0
17+
github.com/spf13/cobra v1.8.0
1818
github.com/spf13/pflag v1.0.5
19-
github.com/spf13/viper v1.10.0
19+
github.com/spf13/viper v1.18.2
2020
github.com/stretchr/testify v1.8.4
21-
golang.org/x/text v0.13.0
22-
k8s.io/api v0.27.8
23-
k8s.io/apiextensions-apiserver v0.27.8
24-
k8s.io/apimachinery v0.27.8
25-
k8s.io/client-go v0.27.8
26-
k8s.io/kubectl v0.27.8
27-
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
28-
sigs.k8s.io/controller-runtime v0.15.3
21+
golang.org/x/text v0.14.0
22+
k8s.io/api v0.28.5
23+
k8s.io/apiextensions-apiserver v0.28.5
24+
k8s.io/apimachinery v0.28.5
25+
k8s.io/client-go v0.28.5
26+
k8s.io/kubectl v0.28.5
27+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
28+
sigs.k8s.io/controller-runtime v0.16.3
2929
sigs.k8s.io/kubebuilder/v3 v3.12.0
30-
sigs.k8s.io/yaml v1.3.0
30+
sigs.k8s.io/yaml v1.4.0
3131
)
3232

33-
require github.com/operator-framework/api v0.20.0 // indirect
34-
3533
require (
3634
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3735
github.com/beorn7/perks v1.0.1 // indirect
3836
github.com/blang/semver/v4 v4.0.0 // indirect
39-
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
4037
github.com/cespare/xxhash/v2 v2.2.0 // indirect
41-
github.com/davecgh/go-spew v1.1.1 // indirect
38+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4239
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4340
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4441
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
45-
github.com/fsnotify/fsnotify v1.6.0 // indirect
42+
github.com/fsnotify/fsnotify v1.7.0 // indirect
4643
github.com/go-logr/zapr v1.2.4 // indirect
4744
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4845
github.com/go-openapi/jsonreference v0.20.2 // indirect
4946
github.com/go-openapi/swag v0.22.4 // indirect
5047
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5148
github.com/gobuffalo/flect v1.0.2 // indirect
52-
github.com/gofrs/uuid v4.0.0+incompatible // indirect
5349
github.com/gogo/protobuf v1.3.2 // indirect
5450
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5551
github.com/golang/protobuf v1.5.3 // indirect
5652
github.com/google/cel-go v0.16.1 // indirect
57-
github.com/google/gnostic v0.5.7-v3refs // indirect
53+
github.com/google/gnostic-models v0.6.8 // indirect
5854
github.com/google/go-cmp v0.6.0 // indirect
5955
github.com/google/gofuzz v1.2.0 // indirect
60-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
61-
github.com/google/uuid v1.3.1 // indirect
62-
github.com/gorilla/handlers v1.5.1 // indirect
63-
github.com/h2non/filetype v1.1.1 // indirect
56+
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb // indirect
57+
github.com/google/uuid v1.4.0 // indirect
58+
github.com/h2non/filetype v1.1.3 // indirect
6459
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
6560
github.com/hashicorp/hcl v1.0.0 // indirect
6661
github.com/imdario/mergo v0.3.13 // indirect
6762
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6863
github.com/josharian/intern v1.0.0 // indirect
6964
github.com/json-iterator/go v1.1.12 // indirect
70-
github.com/magiconair/properties v1.8.5 // indirect
65+
github.com/magiconair/properties v1.8.7 // indirect
7166
github.com/mailru/easyjson v0.7.7 // indirect
72-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
67+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
7368
github.com/mitchellh/mapstructure v1.5.0 // indirect
7469
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7570
github.com/modern-go/reflect2 v1.0.2 // indirect
7671
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7772
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
78-
github.com/pelletier/go-toml v1.9.5 // indirect
79-
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
73+
github.com/operator-framework/api v0.21.0 // indirect
74+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
8075
github.com/pkg/errors v0.9.1 // indirect
81-
github.com/pmezard/go-difflib v1.0.0 // indirect
82-
github.com/prometheus/common v0.44.0 // indirect
83-
github.com/prometheus/procfs v0.10.1 // indirect
84-
github.com/spf13/cast v1.5.0 // indirect
85-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
76+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
77+
github.com/prometheus/common v0.45.0 // indirect
78+
github.com/prometheus/procfs v0.12.0 // indirect
79+
github.com/sagikazarmark/locafero v0.4.0 // indirect
80+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
81+
github.com/sourcegraph/conc v0.3.0 // indirect
82+
github.com/spf13/cast v1.6.0 // indirect
8683
github.com/stoewer/go-strcase v1.2.0 // indirect
87-
github.com/subosito/gotenv v1.2.0 // indirect
88-
go.uber.org/goleak v1.3.0 // indirect
84+
github.com/subosito/gotenv v1.6.0 // indirect
8985
go.uber.org/multierr v1.11.0 // indirect
9086
go.uber.org/zap v1.25.0 // indirect
91-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
92-
golang.org/x/mod v0.12.0 // indirect
93-
golang.org/x/net v0.17.0 // indirect
94-
golang.org/x/oauth2 v0.12.0 // indirect
95-
golang.org/x/sys v0.14.0 // indirect
96-
golang.org/x/term v0.13.0 // indirect
97-
golang.org/x/time v0.3.0 // indirect
98-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
87+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
88+
golang.org/x/mod v0.14.0 // indirect
89+
golang.org/x/net v0.20.0 // indirect
90+
golang.org/x/oauth2 v0.15.0 // indirect
91+
golang.org/x/sys v0.16.0 // indirect
92+
golang.org/x/term v0.16.0 // indirect
93+
golang.org/x/time v0.5.0 // indirect
94+
golang.org/x/tools v0.17.0 // indirect
9995
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
100-
google.golang.org/appengine v1.6.7 // indirect
101-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
102-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
103-
google.golang.org/grpc v1.59.0 // indirect
96+
google.golang.org/appengine v1.6.8 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
99+
google.golang.org/grpc v1.60.1 // indirect
104100
google.golang.org/protobuf v1.31.0 // indirect
105101
gopkg.in/inf.v0 v0.9.1 // indirect
106-
gopkg.in/ini.v1 v1.66.2 // indirect
102+
gopkg.in/ini.v1 v1.67.0 // indirect
107103
gopkg.in/yaml.v2 v2.4.0 // indirect
108104
gopkg.in/yaml.v3 v3.0.1 // indirect
109-
k8s.io/component-base v0.27.8 // indirect
105+
k8s.io/component-base v0.28.5 // indirect
110106
k8s.io/klog/v2 v2.100.1 // indirect
111-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
107+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
108+
rsc.io/letsencrypt v0.0.3 // indirect
112109
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
113110
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
114111
)
115-
116-
replace (
117-
// TODO(ryantking): investigate further, v1.5 breaks github.com/deislabs/oras, might be able to update whatever uses the old version of oras
118-
github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
119-
// latest tag resolves to a very old version. this is only used for spinning up local test registries
120-
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
121-
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
122-
)

0 commit comments

Comments
 (0)