Skip to content

Commit 7e9c9b4

Browse files
committed
Update mod to get the new sets pkg
- bumps golang to 1.20 - bumps dependencies to 1.28 - gets the new sets pkg Signed-off-by: Surya Seetharaman <[email protected]>
1 parent c55a78e commit 7e9c9b4

File tree

3 files changed

+67
-406
lines changed

3 files changed

+67
-406
lines changed

conformance/utils/kubernetes/helper.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,8 @@ func PokeServer(t *testing.T, client k8sclient.Interface, kubeConfig *rest.Confi
108108
// cause the test to halt if the specified timeout is exceeded.
109109
func NamespacesMustBeReady(t *testing.T, c client.Client, timeoutConfig config.TimeoutConfig, namespaces []string, statefulSetNames []string) {
110110
t.Helper()
111-
ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.NamespacesMustBeReady)
112-
defer cancel()
113111

114-
waitErr := wait.PollImmediate(1*time.Second, timeoutConfig.NamespacesMustBeReady, func() (bool, error) {
112+
waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, timeoutConfig.NamespacesMustBeReady, true, func(ctx context.Context) (bool, error) {
115113
for i, ns := range namespaces {
116114
statefulSet := &appsv1.StatefulSet{}
117115
statefulSetKey := types.NamespacedName{

go.mod

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module sigs.k8s.io/network-policy-api
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
7-
github.com/stretchr/testify v1.8.1
8-
k8s.io/api v0.26.1
7+
github.com/stretchr/testify v1.8.2
8+
k8s.io/api v0.28.1
99
k8s.io/apiextensions-apiserver v0.26.1
10-
k8s.io/apimachinery v0.26.1
11-
k8s.io/client-go v0.26.1
10+
k8s.io/apimachinery v0.28.2
11+
k8s.io/client-go v0.28.1
1212
k8s.io/code-generator v0.26.1
1313
sigs.k8s.io/controller-runtime v0.14.6
1414
sigs.k8s.io/controller-tools v0.11.1
@@ -18,20 +18,19 @@ require (
1818
require (
1919
github.com/davecgh/go-spew v1.1.1 // indirect
2020
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
21-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
21+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2222
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2323
github.com/fatih/color v1.13.0 // indirect
24-
github.com/go-logr/logr v1.2.3 // indirect
24+
github.com/go-logr/logr v1.2.4 // indirect
2525
github.com/go-openapi/jsonpointer v0.19.6 // indirect
26-
github.com/go-openapi/jsonreference v0.20.1 // indirect
26+
github.com/go-openapi/jsonreference v0.20.2 // indirect
2727
github.com/go-openapi/swag v0.22.3 // indirect
2828
github.com/gobuffalo/flect v0.3.0 // indirect
2929
github.com/gogo/protobuf v1.3.2 // indirect
3030
github.com/golang/protobuf v1.5.3 // indirect
31-
github.com/google/gnostic v0.5.7-v3refs // indirect
31+
github.com/google/gnostic-models v0.6.8 // indirect
3232
github.com/google/go-cmp v0.5.9 // indirect
33-
github.com/google/gofuzz v1.1.0 // indirect
34-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
33+
github.com/google/gofuzz v1.2.0 // indirect
3534
github.com/google/uuid v1.3.0 // indirect
3635
github.com/imdario/mergo v0.3.6 // indirect
3736
github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -44,31 +43,29 @@ require (
4443
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4544
github.com/modern-go/reflect2 v1.0.2 // indirect
4645
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
47-
github.com/onsi/ginkgo/v2 v2.9.1 // indirect
48-
github.com/onsi/gomega v1.27.4 // indirect
4946
github.com/pkg/errors v0.9.1 // indirect
5047
github.com/pmezard/go-difflib v1.0.0 // indirect
5148
github.com/russross/blackfriday/v2 v2.1.0 // indirect
5249
github.com/spf13/cobra v1.6.1 // indirect
5350
github.com/spf13/pflag v1.0.5 // indirect
54-
golang.org/x/mod v0.9.0 // indirect
55-
golang.org/x/net v0.8.0 // indirect
56-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
57-
golang.org/x/sys v0.6.0 // indirect
58-
golang.org/x/term v0.6.0 // indirect
59-
golang.org/x/text v0.8.0 // indirect
51+
golang.org/x/mod v0.10.0 // indirect
52+
golang.org/x/net v0.13.0 // indirect
53+
golang.org/x/oauth2 v0.8.0 // indirect
54+
golang.org/x/sys v0.10.0 // indirect
55+
golang.org/x/term v0.10.0 // indirect
56+
golang.org/x/text v0.11.0 // indirect
6057
golang.org/x/time v0.3.0 // indirect
61-
golang.org/x/tools v0.7.0 // indirect
58+
golang.org/x/tools v0.8.0 // indirect
6259
google.golang.org/appengine v1.6.7 // indirect
63-
google.golang.org/protobuf v1.28.1 // indirect
60+
google.golang.org/protobuf v1.30.0 // indirect
6461
gopkg.in/inf.v0 v0.9.1 // indirect
6562
gopkg.in/yaml.v2 v2.4.0 // indirect
6663
gopkg.in/yaml.v3 v3.0.1 // indirect
6764
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
6865
k8s.io/klog v0.2.0 // indirect
69-
k8s.io/klog/v2 v2.90.1 // indirect
70-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
71-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
66+
k8s.io/klog/v2 v2.100.1 // indirect
67+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
68+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
7269
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7370
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7471
)

0 commit comments

Comments
 (0)