Skip to content

Commit 7fc7204

Browse files
authored
Bumping to k8s 1.26 and controller-runtime 0.14.1 (#111)
* Bumping to k8s v1.26 * Bumping to controller-runtime v0.14.1 * Update tests to Ginkgo v2 Signed-off-by: Simone Tiraboschi <stirabos@redhat.com> Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
1 parent 791cc54 commit 7fc7204

21 files changed

+112
-137
lines changed

conditions/conditions_suite_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ package conditions
1717
import (
1818
"testing"
1919

20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
22-
23-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2422
)
2523

2624
func TestSource(t *testing.T) {
2725
RegisterFailHandler(Fail)
28-
RunSpecsWithDefaultAndCustomReporters(t, "Conditions Suite", []Reporter{printer.NewlineReporter{}, printer.NewProwReporter("Conditions Suite")})
26+
RunSpecs(t, "Conditions Suite")
2927
}

conditions/conditions_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"os"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
apiv2 "github.com/operator-framework/api/pkg/operators/v2"
2525
apierrors "k8s.io/apimachinery/pkg/api/errors"

conditions/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"os"
2020

21-
. "github.com/onsi/ginkgo"
21+
. "github.com/onsi/ginkgo/v2"
2222
. "github.com/onsi/gomega"
2323
apiv2 "github.com/operator-framework/api/pkg/operators/v2"
2424
"k8s.io/apimachinery/pkg/runtime"

go.mod

+27-31
Original file line numberDiff line numberDiff line change
@@ -4,68 +4,64 @@ go 1.19
44

55
require (
66
github.com/go-logr/logr v1.2.3
7-
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.19.0
7+
github.com/onsi/ginkgo/v2 v2.6.1
8+
github.com/onsi/gomega v1.24.1
99
github.com/operator-framework/api v0.14.0
10-
github.com/prometheus/client_golang v1.12.2
11-
github.com/prometheus/client_model v0.2.0
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
10+
github.com/prometheus/client_golang v1.14.0
11+
github.com/prometheus/client_model v0.3.0
12+
k8s.io/api v0.26.0
13+
k8s.io/apimachinery v0.26.0
14+
k8s.io/client-go v0.26.0
15+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
16+
sigs.k8s.io/controller-runtime v0.14.1
1717
)
1818

1919
require (
20-
github.com/PuerkitoBio/purell v1.1.1 // indirect
21-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2220
github.com/beorn7/perks v1.0.1 // indirect
2321
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2422
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
23+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2624
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2725
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
28-
github.com/fsnotify/fsnotify v1.5.4 // indirect
26+
github.com/fsnotify/fsnotify v1.6.0 // indirect
2927
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30-
github.com/go-openapi/jsonreference v0.19.5 // indirect
28+
github.com/go-openapi/jsonreference v0.20.0 // indirect
3129
github.com/go-openapi/swag v0.19.14 // indirect
3230
github.com/gogo/protobuf v1.3.2 // indirect
3331
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3432
github.com/golang/protobuf v1.5.2 // indirect
3533
github.com/google/gnostic v0.5.7-v3refs // indirect
36-
github.com/google/go-cmp v0.5.8 // indirect
34+
github.com/google/go-cmp v0.5.9 // indirect
3735
github.com/google/gofuzz v1.1.0 // indirect
3836
github.com/google/uuid v1.1.2 // indirect
3937
github.com/imdario/mergo v0.3.12 // indirect
4038
github.com/josharian/intern v1.0.0 // indirect
4139
github.com/json-iterator/go v1.1.12 // indirect
4240
github.com/mailru/easyjson v0.7.6 // indirect
43-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
41+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
4442
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4543
github.com/modern-go/reflect2 v1.0.2 // indirect
4644
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
47-
github.com/nxadm/tail v1.4.8 // indirect
4845
github.com/pkg/errors v0.9.1 // indirect
49-
github.com/prometheus/common v0.32.1 // indirect
50-
github.com/prometheus/procfs v0.7.3 // indirect
46+
github.com/prometheus/common v0.37.0 // indirect
47+
github.com/prometheus/procfs v0.8.0 // indirect
5148
github.com/spf13/pflag v1.0.5 // indirect
52-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
53-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
54-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
55-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
56-
golang.org/x/text v0.3.7 // indirect
57-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
49+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
50+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
51+
golang.org/x/sys v0.3.0 // indirect
52+
golang.org/x/term v0.3.0 // indirect
53+
golang.org/x/text v0.5.0 // indirect
54+
golang.org/x/time v0.3.0 // indirect
5855
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
5956
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/protobuf v1.28.0 // indirect
57+
google.golang.org/protobuf v1.28.1 // indirect
6158
gopkg.in/inf.v0 v0.9.1 // indirect
62-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6359
gopkg.in/yaml.v2 v2.4.0 // indirect
6460
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
61+
k8s.io/apiextensions-apiserver v0.26.0 // indirect
62+
k8s.io/component-base v0.26.0 // indirect
63+
k8s.io/klog/v2 v2.80.1 // indirect
64+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
6965
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
7066
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7167
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)