Skip to content

Commit 8c7e1e2

Browse files
bshepharvarshaprasad96
bshephar
and
varshaprasad96
authored
Bump controller-runtime and k8s.io deps (#216)
* Bump controller-runtime and k8s.io deps This change bumps controller-runtime to 0.15 and k8s.io/* deps to 0.27.2 Signed-off-by: Brendan Shephard <[email protected]> * Move to controller-runtime 0.15.0 This commit contains: 1. Bumping and pinning of right dependencies 2. Remove Delegating client 3. Fixing NewDynamicRestMapper func signature 4. Fix cmd/ to not take client as an option 5. Use go/v4 instead of v3 Signed-off-by: Varsha Prasad Narsing <[email protected]> * Update versions and generate testdata * Linter fixes: update deprecated Cache funcs Signed-off-by: Varsha Prasad Narsing <[email protected]> * Fix: fix data race in reconciler tests Signed-off-by: Varsha Prasad Narsing <[email protected]> * Linter fixes: add additional tests for caches and remove wh config checks Signed-off-by: Varsha Prasad Narsing <[email protected]> * Linter fixes: skip linter checks for component config Signed-off-by: Varsha Prasad Narsing <[email protected]> * bump kubebuilder to latest version Signed-off-by: Varsha Prasad Narsing <[email protected]> * fix sanity tests Signed-off-by: Varsha Prasad Narsing <[email protected]> * Bump controller-runtime and k8s.io deps This change bumps controller-runtime to 0.15 and k8s.io/* deps to 0.27.2 Signed-off-by: Brendan Shephard <[email protected]> --------- Signed-off-by: Brendan Shephard <[email protected]> Signed-off-by: Varsha Prasad Narsing <[email protected]> Co-authored-by: Varsha Prasad Narsing <[email protected]>
1 parent dcf106e commit 8c7e1e2

File tree

38 files changed

+787
-683
lines changed

38 files changed

+787
-683
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v3
1919
with:
20-
go-version: ~1.19
20+
go-version: ~1.20
2121
id: go
2222

2323
- name: Check out code into the Go module directory
@@ -56,7 +56,7 @@ jobs:
5656
- name: Set up Go
5757
uses: actions/setup-go@v3
5858
with:
59-
go-version: ~1.19
59+
go-version: ~1.20
6060
id: go
6161

6262
- name: Check out code into the Go module directory
@@ -65,7 +65,7 @@ jobs:
6565
- name: Lint
6666
uses: golangci/golangci-lint-action@v3
6767
with:
68-
version: v1.48.0
68+
version: v1.51.2
6969

7070
go-apidiff:
7171
name: go-apidiff
@@ -76,7 +76,7 @@ jobs:
7676
- name: Set up Go
7777
uses: actions/setup-go@v3
7878
with:
79-
go-version: ~1.19
79+
go-version: ~1.20
8080
id: go
8181

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

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install Go
2929
uses: actions/setup-go@v3
3030
with:
31-
go-version: ~1.19
31+
go-version: ~1.20
3232

3333
- name: Create release
3434
run: |

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.19 as builder
2+
FROM --platform=$BUILDPLATFORM golang:1.20 as builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ build:
6161

6262
.PHONY: setup-lint
6363
setup-lint: ## Setup the lint
64-
fetch golangci-lint 1.48.0
64+
fetch golangci-lint 1.51.2
6565

6666
# Run various checks against code
6767
.PHONY: lint

‎go.mod

Lines changed: 84 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,179 +1,182 @@
11
module github.com/operator-framework/helm-operator-plugins
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/go-logr/logr v1.2.3
8-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
7+
github.com/go-logr/logr v1.2.4
8+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
99
github.com/iancoleman/strcase v0.2.0
1010
github.com/kr/text v0.2.0
11-
github.com/onsi/ginkgo/v2 v2.7.0
12-
github.com/onsi/gomega v1.24.2
13-
github.com/operator-framework/operator-lib v0.11.1-0.20230306195046-28cadc6b6055
14-
github.com/prometheus/client_golang v1.14.0
11+
github.com/onsi/ginkgo/v2 v2.11.0
12+
github.com/onsi/gomega v1.27.8
13+
github.com/operator-framework/operator-lib v0.11.1-0.20230607132417-ecb9be488378
14+
github.com/prometheus/client_golang v1.15.1
1515
github.com/sergi/go-diff v1.2.0
16-
github.com/sirupsen/logrus v1.9.0
17-
github.com/spf13/afero v1.9.3
18-
github.com/spf13/cobra v1.6.1
16+
github.com/sirupsen/logrus v1.9.3
17+
github.com/spf13/afero v1.9.5
18+
github.com/spf13/cobra v1.7.0
1919
github.com/spf13/pflag v1.0.5
20-
github.com/stretchr/testify v1.8.1
21-
gomodules.xyz/jsonpatch/v2 v2.2.0
22-
helm.sh/helm/v3 v3.10.3
23-
k8s.io/api v0.26.2
24-
k8s.io/apiextensions-apiserver v0.26.2
25-
k8s.io/apimachinery v0.26.2
26-
k8s.io/cli-runtime v0.26.2
27-
k8s.io/client-go v0.26.2
28-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
29-
sigs.k8s.io/controller-runtime v0.14.5
30-
sigs.k8s.io/kubebuilder/v3 v3.9.0
20+
github.com/stretchr/testify v1.8.2
21+
gomodules.xyz/jsonpatch/v2 v2.3.0
22+
helm.sh/helm/v3 v3.12.1
23+
k8s.io/api v0.27.2
24+
k8s.io/apiextensions-apiserver v0.27.2
25+
k8s.io/apimachinery v0.27.2
26+
k8s.io/cli-runtime v0.27.2
27+
k8s.io/client-go v0.27.2
28+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
29+
sigs.k8s.io/controller-runtime v0.15.0
30+
sigs.k8s.io/kubebuilder/v3 v3.11.1
3131
sigs.k8s.io/yaml v1.3.0
3232
)
3333

3434
require (
3535
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
36-
github.com/BurntSushi/toml v1.2.0 // indirect
36+
github.com/BurntSushi/toml v1.2.1 // indirect
3737
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3838
github.com/Masterminds/goutils v1.1.1 // indirect
39-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
40-
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
41-
github.com/Masterminds/squirrel v1.5.3 // indirect
39+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
40+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
41+
github.com/Masterminds/squirrel v1.5.4 // indirect
4242
github.com/Microsoft/go-winio v0.6.0 // indirect
4343
github.com/Microsoft/hcsshim v0.9.4 // indirect
4444
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
45-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
45+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4646
github.com/benbjohnson/clock v1.3.0 // indirect
4747
github.com/beorn7/perks v1.0.1 // indirect
4848
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
4949
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
5050
github.com/bugsnag/panicwrap v1.2.0 // indirect
51-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
51+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5252
github.com/chai2010/gettext-go v1.0.2 // indirect
5353
github.com/containerd/cgroups v1.0.4 // indirect
54-
github.com/containerd/containerd v1.6.8 // indirect
54+
github.com/containerd/containerd v1.7.0 // indirect
5555
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
5656
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
5757
github.com/davecgh/go-spew v1.1.1 // indirect
58-
github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269 // indirect
59-
github.com/docker/cli v20.10.19+incompatible // indirect
60-
github.com/docker/distribution v2.8.1+incompatible // indirect
61-
github.com/docker/docker v20.10.19+incompatible // indirect
58+
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
59+
github.com/docker/cli v20.10.21+incompatible // indirect
60+
github.com/docker/distribution v2.8.2+incompatible // indirect
61+
github.com/docker/docker v20.10.24+incompatible // indirect
6262
github.com/docker/docker-credential-helpers v0.7.0 // indirect
6363
github.com/docker/go-connections v0.4.0 // indirect
6464
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
6565
github.com/docker/go-metrics v0.0.1 // indirect
6666
github.com/docker/go-units v0.5.0 // indirect
6767
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
68-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
68+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
6969
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7070
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
7171
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
7272
github.com/fatih/color v1.13.0 // indirect
7373
github.com/felixge/httpsnoop v1.0.3 // indirect
7474
github.com/fsnotify/fsnotify v1.6.0 // indirect
7575
github.com/go-errors/errors v1.4.2 // indirect
76-
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
77-
github.com/go-logr/zapr v1.2.3 // indirect
78-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
79-
github.com/go-openapi/jsonreference v0.20.0 // indirect
80-
github.com/go-openapi/swag v0.22.3 // indirect
81-
github.com/gobuffalo/flect v1.0.0 // indirect
76+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
77+
github.com/go-logr/zapr v1.2.4 // indirect
78+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
79+
github.com/go-openapi/jsonreference v0.20.2 // indirect
80+
github.com/go-openapi/swag v0.22.4 // indirect
81+
github.com/gobuffalo/flect v1.0.2 // indirect
8282
github.com/gobwas/glob v0.2.3 // indirect
8383
github.com/gofrs/uuid v4.0.0+incompatible // indirect
8484
github.com/gogo/protobuf v1.3.2 // indirect
8585
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
86-
github.com/golang/protobuf v1.5.2 // indirect
86+
github.com/golang/protobuf v1.5.3 // indirect
8787
github.com/gomodule/redigo v1.8.2 // indirect
8888
github.com/google/btree v1.1.2 // indirect
8989
github.com/google/gnostic v0.6.9 // indirect
9090
github.com/google/go-cmp v0.5.9 // indirect
9191
github.com/google/gofuzz v1.2.0 // indirect
92+
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
9293
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9394
github.com/google/uuid v1.3.0 // indirect
9495
github.com/gorilla/handlers v1.5.1 // indirect
9596
github.com/gorilla/mux v1.8.0 // indirect
9697
github.com/gosuri/uitable v0.0.4 // indirect
9798
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
98-
github.com/huandu/xstrings v1.3.2 // indirect
99-
github.com/imdario/mergo v0.3.13 // indirect
100-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
99+
github.com/hashicorp/errwrap v1.1.0 // indirect
100+
github.com/hashicorp/go-multierror v1.1.1 // indirect
101+
github.com/hashicorp/golang-lru v0.5.4 // indirect
102+
github.com/huandu/xstrings v1.4.0 // indirect
103+
github.com/imdario/mergo v0.3.16 // indirect
104+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
101105
github.com/jmoiron/sqlx v1.3.5 // indirect
102106
github.com/josharian/intern v1.0.0 // indirect
103107
github.com/json-iterator/go v1.1.12 // indirect
104108
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
105109
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
106110
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
107-
github.com/lib/pq v1.10.7 // indirect
111+
github.com/lib/pq v1.10.9 // indirect
108112
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
109113
github.com/mailru/easyjson v0.7.7 // indirect
110114
github.com/mattn/go-colorable v0.1.13 // indirect
111-
github.com/mattn/go-isatty v0.0.16 // indirect
115+
github.com/mattn/go-isatty v0.0.17 // indirect
112116
github.com/mattn/go-runewidth v0.0.14 // indirect
113-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
117+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
114118
github.com/mitchellh/copystructure v1.2.0 // indirect
115119
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
116120
github.com/mitchellh/reflectwalk v1.0.2 // indirect
117121
github.com/moby/spdystream v0.2.0 // indirect
118-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
122+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
119123
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
120124
github.com/modern-go/reflect2 v1.0.2 // indirect
121125
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
122126
github.com/morikuni/aec v1.0.0 // indirect
123127
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
124128
github.com/opencontainers/go-digest v1.0.0 // indirect
125-
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
129+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
126130
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
127131
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
128132
github.com/pkg/errors v0.9.1 // indirect
129133
github.com/pmezard/go-difflib v1.0.0 // indirect
130-
github.com/prometheus/client_model v0.3.0 // indirect
131-
github.com/prometheus/common v0.37.0 // indirect
132-
github.com/prometheus/procfs v0.8.0 // indirect
134+
github.com/prometheus/client_model v0.4.0 // indirect
135+
github.com/prometheus/common v0.44.0 // indirect
136+
github.com/prometheus/procfs v0.10.1 // indirect
133137
github.com/rivo/uniseg v0.4.2 // indirect
134-
github.com/rubenv/sql-migrate v1.2.0 // indirect
135-
github.com/russross/blackfriday v1.6.0 // indirect
138+
github.com/rubenv/sql-migrate v1.3.1 // indirect
139+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
136140
github.com/shopspring/decimal v1.3.1 // indirect
137141
github.com/spf13/cast v1.5.0 // indirect
138142
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
139143
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
140144
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
141-
github.com/xlab/treeprint v1.1.0 // indirect
145+
github.com/xlab/treeprint v1.2.0 // indirect
142146
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
143147
github.com/yvasiyarov/gorelic v0.0.7 // indirect
144148
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
145-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
146149
go.opencensus.io v0.23.0 // indirect
147-
go.starlark.net v0.0.0-20221010140840-6bf6f0955179 // indirect
150+
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
148151
go.uber.org/atomic v1.10.0 // indirect
149152
go.uber.org/multierr v1.8.0 // indirect
150153
go.uber.org/zap v1.24.0 // indirect
151-
golang.org/x/crypto v0.1.0 // indirect
152-
golang.org/x/mod v0.7.0 // indirect
153-
golang.org/x/net v0.7.0 // indirect
154-
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
155-
golang.org/x/sync v0.1.0 // indirect
156-
golang.org/x/sys v0.5.0 // indirect
157-
golang.org/x/term v0.5.0 // indirect
158-
golang.org/x/text v0.7.0 // indirect
154+
golang.org/x/crypto v0.10.0 // indirect
155+
golang.org/x/mod v0.11.0 // indirect
156+
golang.org/x/net v0.11.0 // indirect
157+
golang.org/x/oauth2 v0.9.0 // indirect
158+
golang.org/x/sync v0.3.0 // indirect
159+
golang.org/x/sys v0.9.0 // indirect
160+
golang.org/x/term v0.9.0 // indirect
161+
golang.org/x/text v0.10.0 // indirect
159162
golang.org/x/time v0.3.0 // indirect
160-
golang.org/x/tools v0.5.0 // indirect
163+
golang.org/x/tools v0.10.0 // indirect
161164
google.golang.org/appengine v1.6.7 // indirect
162-
google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b // indirect
163-
google.golang.org/grpc v1.50.0 // indirect
164-
google.golang.org/protobuf v1.28.1 // indirect
165+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
166+
google.golang.org/grpc v1.53.0 // indirect
167+
google.golang.org/protobuf v1.30.0 // indirect
165168
gopkg.in/inf.v0 v0.9.1 // indirect
166169
gopkg.in/yaml.v2 v2.4.0 // indirect
167170
gopkg.in/yaml.v3 v3.0.1 // indirect
168-
k8s.io/apiserver v0.26.2 // indirect
169-
k8s.io/component-base v0.26.2 // indirect
170-
k8s.io/klog/v2 v2.80.1 // indirect
171-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
172-
k8s.io/kubectl v0.25.3 // indirect
173-
oras.land/oras-go v1.2.0 // indirect
174-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
175-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
176-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
171+
k8s.io/apiserver v0.27.2 // indirect
172+
k8s.io/component-base v0.27.2 // indirect
173+
k8s.io/klog/v2 v2.100.1 // indirect
174+
k8s.io/kube-openapi v0.0.0-20230606174411-725288a7abf1 // indirect
175+
k8s.io/kubectl v0.27.2 // indirect
176+
oras.land/oras-go v1.2.2 // indirect
177+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
178+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
179+
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
177180
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
178181
)
179182

@@ -183,4 +186,8 @@ replace (
183186
github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
184187
// latest tag resolves to a very old version. this is only used for spinning up local test registries
185188
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
189+
190+
// #TODO: Remove when bumping to k8s 1.28. Issue tracked by https://github.com/kubernetes/kube-openapi/issues/404
191+
github.com/google/gnostic v0.6.9 => github.com/google/gnostic v0.5.7-v3refs
192+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
186193
)

0 commit comments

Comments
 (0)