Skip to content

Commit 4295f8e

Browse files
authored
Merge branch 'main' into add-max-history
2 parents 4523eef + 7e1a24a commit 4295f8e

File tree

29 files changed

+876
-1026
lines changed

29 files changed

+876
-1026
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
- name: Test Sanity
3131
run: make test-sanity
3232

33-
- uses: codecov/codecov-action@v3
33+
- uses: codecov/codecov-action@v4
3434
with:
35+
disable_search: true
3536
files: cover.out
36-
functionalities: fixes
3737

3838
lint:
3939
name: Lint
@@ -48,9 +48,9 @@ jobs:
4848
go-version-file: "go.mod"
4949

5050
- name: Lint
51-
uses: golangci/golangci-lint-action@v3
51+
uses: golangci/golangci-lint-action@v6
5252
with:
53-
version: v1.51.2
53+
version: v1.54.1
5454

5555
go-apidiff:
5656
name: go-apidiff

go.mod

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
module github.com/operator-framework/helm-operator-plugins
22

3-
go 1.20
3+
go 1.22.0
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/go-logr/logr v1.2.4
8-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
9-
github.com/iancoleman/strcase v0.2.0
7+
github.com/go-logr/logr v1.4.1
8+
github.com/go-task/slim-sprig/v3 v3.0.0
9+
github.com/iancoleman/strcase v0.3.0
1010
github.com/kr/text v0.2.0
11-
github.com/onsi/ginkgo/v2 v2.13.0
12-
github.com/onsi/gomega v1.30.0
13-
github.com/operator-framework/operator-lib v0.12.0
11+
github.com/onsi/ginkgo/v2 v2.17.1
12+
github.com/onsi/gomega v1.32.0
13+
github.com/operator-framework/operator-lib v0.14.0
1414
github.com/pkg/errors v0.9.1
15-
github.com/prometheus/client_golang v1.18.0
16-
github.com/sergi/go-diff v1.2.0
15+
github.com/prometheus/client_golang v1.19.0
16+
github.com/sergi/go-diff v1.3.1
1717
github.com/sirupsen/logrus v1.9.3
18-
github.com/spf13/afero v1.10.0
18+
github.com/spf13/afero v1.11.0
1919
github.com/spf13/cobra v1.8.0
2020
github.com/spf13/pflag v1.0.5
21-
github.com/stretchr/testify v1.8.4
21+
github.com/stretchr/testify v1.9.0
2222
gomodules.xyz/jsonpatch/v2 v2.4.0
23-
helm.sh/helm/v3 v3.13.3
24-
k8s.io/api v0.28.5
25-
k8s.io/apiextensions-apiserver v0.28.5
26-
k8s.io/apimachinery v0.28.5
27-
k8s.io/cli-runtime v0.28.5
28-
k8s.io/client-go v0.28.5
29-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
30-
sigs.k8s.io/controller-runtime v0.16.3
31-
sigs.k8s.io/kubebuilder/v3 v3.13.0
23+
helm.sh/helm/v3 v3.15.0
24+
k8s.io/api v0.30.0
25+
k8s.io/apiextensions-apiserver v0.30.0
26+
k8s.io/apimachinery v0.30.0
27+
k8s.io/cli-runtime v0.30.0
28+
k8s.io/client-go v0.30.0
29+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
30+
sigs.k8s.io/controller-runtime v0.18.2
31+
sigs.k8s.io/kubebuilder/v3 v3.14.0
3232
sigs.k8s.io/yaml v1.4.0
3333
)
3434

@@ -50,50 +50,52 @@ require (
5050
github.com/bugsnag/panicwrap v1.2.0 // indirect
5151
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5252
github.com/chai2010/gettext-go v1.0.2 // indirect
53-
github.com/containerd/containerd v1.7.11 // indirect
53+
github.com/containerd/containerd v1.7.12 // indirect
5454
github.com/containerd/log v0.1.0 // indirect
5555
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
5656
github.com/davecgh/go-spew v1.1.1 // indirect
5757
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
58-
github.com/docker/cli v24.0.6+incompatible // indirect
59-
github.com/docker/distribution v2.8.2+incompatible // indirect
60-
github.com/docker/docker v24.0.7+incompatible // indirect
58+
github.com/distribution/reference v0.5.0 // indirect
59+
github.com/docker/cli v25.0.5+incompatible // indirect
60+
github.com/docker/distribution v2.8.3+incompatible // indirect
61+
github.com/docker/docker v25.0.5+incompatible // indirect
6162
github.com/docker/docker-credential-helpers v0.7.0 // indirect
62-
github.com/docker/go-connections v0.4.0 // indirect
63+
github.com/docker/go-connections v0.5.0 // indirect
6364
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
6465
github.com/docker/go-metrics v0.0.1 // indirect
65-
github.com/docker/go-units v0.5.0 // indirect
6666
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
67-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
68-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
69-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
67+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
68+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
69+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
7070
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
7171
github.com/fatih/color v1.13.0 // indirect
7272
github.com/felixge/httpsnoop v1.0.3 // indirect
73-
github.com/fsnotify/fsnotify v1.6.0 // indirect
73+
github.com/fsnotify/fsnotify v1.7.0 // indirect
7474
github.com/go-errors/errors v1.4.2 // indirect
7575
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
7676
github.com/go-logr/stdr v1.2.2 // 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
77+
github.com/go-logr/zapr v1.3.0 // indirect
78+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
79+
github.com/go-openapi/jsonreference v0.20.4 // indirect
80+
github.com/go-openapi/swag v0.22.9 // indirect
81+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8182
github.com/gobuffalo/flect v1.0.2 // indirect
8283
github.com/gobwas/glob v0.2.3 // indirect
8384
github.com/gofrs/uuid v4.0.0+incompatible // indirect
8485
github.com/gogo/protobuf v1.3.2 // indirect
8586
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
86-
github.com/golang/protobuf v1.5.3 // indirect
87+
github.com/golang/protobuf v1.5.4 // indirect
8788
github.com/gomodule/redigo v1.8.2 // indirect
8889
github.com/google/btree v1.1.2 // indirect
8990
github.com/google/gnostic-models v0.6.8 // indirect
9091
github.com/google/go-cmp v0.6.0 // indirect
9192
github.com/google/gofuzz v1.2.0 // indirect
9293
github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb // indirect
9394
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
94-
github.com/google/uuid v1.3.1 // indirect
95+
github.com/google/uuid v1.6.0 // indirect
9596
github.com/gorilla/handlers v1.5.1 // indirect
9697
github.com/gorilla/mux v1.8.0 // indirect
98+
github.com/gorilla/websocket v1.5.0 // indirect
9799
github.com/gosuri/uitable v0.0.4 // indirect
98100
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
99101
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -115,7 +117,6 @@ require (
115117
github.com/mattn/go-colorable v0.1.13 // indirect
116118
github.com/mattn/go-isatty v0.0.17 // indirect
117119
github.com/mattn/go-runewidth v0.0.14 // indirect
118-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
119120
github.com/mitchellh/copystructure v1.2.0 // indirect
120121
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
121122
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -125,15 +126,15 @@ require (
125126
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
126127
github.com/modern-go/reflect2 v1.0.2 // indirect
127128
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
128-
github.com/morikuni/aec v1.0.0 // indirect
129129
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
130+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
130131
github.com/opencontainers/go-digest v1.0.0 // indirect
131-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
132+
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
132133
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
133134
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
134135
github.com/pmezard/go-difflib v1.0.0 // indirect
135-
github.com/prometheus/client_model v0.5.0 // indirect
136-
github.com/prometheus/common v0.45.0 // indirect
136+
github.com/prometheus/client_model v0.6.1 // indirect
137+
github.com/prometheus/common v0.48.0 // indirect
137138
github.com/prometheus/procfs v0.12.0 // indirect
138139
github.com/rivo/uniseg v0.4.2 // indirect
139140
github.com/rubenv/sql-migrate v1.5.2 // indirect
@@ -153,33 +154,33 @@ require (
153154
go.opentelemetry.io/otel/trace v1.19.0 // indirect
154155
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
155156
go.uber.org/multierr v1.11.0 // indirect
156-
go.uber.org/zap v1.25.0 // indirect
157-
golang.org/x/crypto v0.17.0 // indirect
158-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
159-
golang.org/x/mod v0.13.0 // indirect
160-
golang.org/x/net v0.17.0 // indirect
161-
golang.org/x/oauth2 v0.12.0 // indirect
162-
golang.org/x/sync v0.4.0 // indirect
163-
golang.org/x/sys v0.15.0 // indirect
164-
golang.org/x/term v0.15.0 // indirect
157+
go.uber.org/zap v1.26.0 // indirect
158+
golang.org/x/crypto v0.21.0 // indirect
159+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
160+
golang.org/x/mod v0.15.0 // indirect
161+
golang.org/x/net v0.23.0 // indirect
162+
golang.org/x/oauth2 v0.17.0 // indirect
163+
golang.org/x/sync v0.6.0 // indirect
164+
golang.org/x/sys v0.18.0 // indirect
165+
golang.org/x/term v0.18.0 // indirect
165166
golang.org/x/text v0.14.0 // indirect
166-
golang.org/x/time v0.3.0 // indirect
167-
golang.org/x/tools v0.14.0 // indirect
168-
google.golang.org/appengine v1.6.7 // indirect
169-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
170-
google.golang.org/grpc v1.58.3 // indirect
171-
google.golang.org/protobuf v1.31.0 // indirect
167+
golang.org/x/time v0.5.0 // indirect
168+
golang.org/x/tools v0.18.0 // indirect
169+
google.golang.org/appengine v1.6.8 // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
171+
google.golang.org/grpc v1.59.0 // indirect
172+
google.golang.org/protobuf v1.33.0 // indirect
172173
gopkg.in/inf.v0 v0.9.1 // indirect
173174
gopkg.in/yaml.v2 v2.4.0 // indirect
174175
gopkg.in/yaml.v3 v3.0.1 // indirect
175-
k8s.io/apiserver v0.28.5 // indirect
176-
k8s.io/component-base v0.28.5 // indirect
177-
k8s.io/klog/v2 v2.100.1 // indirect
178-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
179-
k8s.io/kubectl v0.28.5 // indirect
180-
oras.land/oras-go v1.2.4 // indirect
176+
k8s.io/apiserver v0.30.0 // indirect
177+
k8s.io/component-base v0.30.0 // indirect
178+
k8s.io/klog/v2 v2.120.1 // indirect
179+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
180+
k8s.io/kubectl v0.30.0 // indirect
181+
oras.land/oras-go v1.2.5 // indirect
181182
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
182183
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
183184
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
184-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
185+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
185186
)

0 commit comments

Comments
 (0)