Skip to content

Commit 96b79e7

Browse files
richardcaserichardcase
authored
Merge pull request #135 from lrascao/dependabot/go_modules/github.com/onsi/ginkgo/v2-2.9.4
Dependabot/go modules/GitHub.com/onsi/ginkgo/v2 2.9.4
2 parents 1d27bb4 + 4fe5e53 commit 96b79e7

File tree

15 files changed

+151
-379
lines changed

15 files changed

+151
-379
lines changed

‎bootstrap/api/v1alpha1/webhook_suite_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737
"sigs.k8s.io/controller-runtime/pkg/envtest"
38-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3938
logf "sigs.k8s.io/controller-runtime/pkg/log"
4039
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4140
)
@@ -51,9 +50,7 @@ var (
5150
func TestAPIs(t *testing.T) {
5251
RegisterFailHandler(Fail)
5352

54-
RunSpecsWithDefaultAndCustomReporters(t,
55-
"Webhook Suite",
56-
[]Reporter{printer.NewlineReporter{}})
53+
RunSpecs(t, "Webhook Suite")
5754
}
5855

5956
var _ = BeforeSuite(func() {

‎bootstrap/internal/cloudinit/cloudinit_suite_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@ import (
2121

2222
. "github.com/onsi/ginkgo"
2323
. "github.com/onsi/gomega"
24-
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2624
)
2725

2826
func TestCloudInit(t *testing.T) {
2927
RegisterFailHandler(Fail)
3028

31-
RunSpecsWithDefaultAndCustomReporters(t,
32-
"CloudInit Suite",
33-
[]Reporter{printer.NewlineReporter{}})
29+
RunSpecs(t, "CloudInit Suite")
3430
}

‎bootstrap/internal/controllers/rke2config_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -732,15 +732,15 @@ func (r *RKE2ConfigReconciler) generateAndStoreToken(ctx context.Context, scope
732732
Name: bsutil.TokenName(scope.Cluster.Name),
733733
Namespace: scope.Config.Namespace,
734734
Labels: map[string]string{
735-
clusterv1.ClusterLabelName: scope.Cluster.Name,
735+
clusterv1.ClusterNameLabel: scope.Cluster.Name,
736736
},
737737
OwnerReferences: []metav1.OwnerReference{
738738
{
739739
APIVersion: scope.Cluster.APIVersion,
740740
Kind: scope.Cluster.Kind,
741741
Name: scope.Cluster.Name,
742742
UID: scope.Cluster.UID,
743-
Controller: pointer.BoolPtr(true),
743+
Controller: pointer.Bool(true),
744744
},
745745
},
746746
},
@@ -765,15 +765,15 @@ func (r *RKE2ConfigReconciler) storeBootstrapData(ctx context.Context, scope *Sc
765765
Name: scope.Config.Name,
766766
Namespace: scope.Config.Namespace,
767767
Labels: map[string]string{
768-
clusterv1.ClusterLabelName: scope.Cluster.Name,
768+
clusterv1.ClusterNameLabel: scope.Cluster.Name,
769769
},
770770
OwnerReferences: []metav1.OwnerReference{
771771
{
772772
APIVersion: scope.Config.APIVersion,
773773
Kind: scope.Config.Kind,
774774
Name: scope.Config.Name,
775775
UID: scope.Config.UID,
776-
Controller: pointer.BoolPtr(true),
776+
Controller: pointer.Bool(true),
777777
},
778778
},
779779
},
@@ -788,7 +788,7 @@ func (r *RKE2ConfigReconciler) storeBootstrapData(ctx context.Context, scope *Sc
788788
return err
789789
}
790790

791-
scope.Config.Status.DataSecretName = pointer.StringPtr(secret.Name)
791+
scope.Config.Status.DataSecretName = pointer.String(secret.Name)
792792
scope.Config.Status.Ready = true
793793
// conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
794794
return nil

‎bootstrap/internal/controllers/suite_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"k8s.io/client-go/rest"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/envtest"
30-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3130
logf "sigs.k8s.io/controller-runtime/pkg/log"
3231
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3332

@@ -46,9 +45,7 @@ var (
4645
func TestAPIs(t *testing.T) {
4746
RegisterFailHandler(Fail)
4847

49-
RunSpecsWithDefaultAndCustomReporters(t,
50-
"Controller Suite",
51-
[]Reporter{printer.NewlineReporter{}})
48+
RunSpecs(t, "Controller Suite")
5249
}
5350

5451
var _ = BeforeSuite(func() {

‎controlplane/api/v1alpha1/webhook_suite_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737
"sigs.k8s.io/controller-runtime/pkg/envtest"
38-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3938
logf "sigs.k8s.io/controller-runtime/pkg/log"
4039
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4140
)
@@ -54,9 +53,7 @@ var (
5453
func TestAPIs(t *testing.T) {
5554
RegisterFailHandler(Fail)
5655

57-
RunSpecsWithDefaultAndCustomReporters(t,
58-
"Webhook Suite",
59-
[]Reporter{printer.NewlineReporter{}})
56+
RunSpecs(t, "Webhook Suite")
6057
}
6158

6259
var _ = BeforeSuite(func() {

‎controlplane/internal/controllers/suite_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"k8s.io/client-go/rest"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/envtest"
30-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3130
logf "sigs.k8s.io/controller-runtime/pkg/log"
3231
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3332

@@ -46,9 +45,7 @@ var (
4645
func TestAPIs(t *testing.T) {
4746
RegisterFailHandler(Fail)
4847

49-
RunSpecsWithDefaultAndCustomReporters(t,
50-
"Controller Suite",
51-
[]Reporter{printer.NewlineReporter{}})
48+
RunSpecs(t, "Controller Suite")
5249
}
5350

5451
var _ = BeforeSuite(func() {

‎go.mod‎

Lines changed: 43 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,26 @@ go 1.19
55
require (
66
github.com/flatcar/container-linux-config-transpiler v0.9.4
77
github.com/flatcar/ignition v0.36.2
8-
github.com/go-logr/logr v1.2.3
8+
github.com/go-logr/logr v1.2.4
99
github.com/onsi/ginkgo v1.16.5
10-
github.com/onsi/ginkgo/v2 v2.9.1
11-
github.com/onsi/gomega v1.27.4
10+
github.com/onsi/ginkgo/v2 v2.9.4
11+
github.com/onsi/gomega v1.27.6
1212
github.com/pkg/errors v0.9.1
1313
github.com/spf13/pflag v1.0.5
1414
gopkg.in/yaml.v3 v3.0.1
15-
k8s.io/api v0.25.4
16-
k8s.io/apimachinery v0.25.4
17-
k8s.io/apiserver v0.25.4
18-
k8s.io/client-go v0.25.4
15+
k8s.io/api v0.26.1
16+
k8s.io/apimachinery v0.26.1
17+
k8s.io/apiserver v0.26.1
18+
k8s.io/client-go v0.26.1
1919
k8s.io/klog/v2 v2.80.1
20-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
21-
sigs.k8s.io/cluster-api v1.3.2
22-
sigs.k8s.io/cluster-api/test v1.3.2
23-
sigs.k8s.io/controller-runtime v0.13.1
20+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
21+
sigs.k8s.io/cluster-api v1.4.2
22+
sigs.k8s.io/cluster-api/test v1.4.2
23+
sigs.k8s.io/controller-runtime v0.14.6
2424
sigs.k8s.io/yaml v1.3.0
2525
)
2626

2727
require (
28-
cloud.google.com/go/compute v1.7.0 // indirect
29-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
30-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
31-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
32-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
33-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
34-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3528
github.com/BurntSushi/toml v1.0.0 // indirect
3629
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3730
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -41,19 +34,19 @@ require (
4134
github.com/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559 // indirect
4235
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
4336
github.com/alessio/shellescape v1.4.1 // indirect
44-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
37+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
4538
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4639
github.com/beorn7/perks v1.0.1 // indirect
4740
github.com/blang/semver v3.5.1+incompatible // indirect
4841
github.com/blang/semver/v4 v4.0.0 // indirect
4942
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5043
github.com/coredns/caddy v1.1.0 // indirect
51-
github.com/coredns/corefile-migration v1.0.18 // indirect
44+
github.com/coredns/corefile-migration v1.0.20 // indirect
5245
github.com/coreos/go-semver v0.3.0 // indirect
5346
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
5447
github.com/davecgh/go-spew v1.1.1 // indirect
5548
github.com/docker/distribution v2.8.1+incompatible // indirect
56-
github.com/docker/docker v20.10.21+incompatible // indirect
49+
github.com/docker/docker v20.10.24+incompatible // indirect
5750
github.com/docker/go-connections v0.4.0 // indirect
5851
github.com/docker/go-units v0.4.0 // indirect
5952
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -65,16 +58,15 @@ require (
6558
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6659
github.com/go-openapi/jsonreference v0.20.0 // indirect
6760
github.com/go-openapi/swag v0.22.3 // indirect
68-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
69-
github.com/gobuffalo/flect v0.3.0 // indirect
61+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
62+
github.com/gobuffalo/flect v1.0.2 // indirect
7063
github.com/gogo/protobuf v1.3.2 // indirect
71-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
7264
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7365
github.com/golang/protobuf v1.5.3 // indirect
74-
github.com/google/cel-go v0.12.4 // indirect
66+
github.com/google/cel-go v0.12.6 // indirect
7567
github.com/google/gnostic v0.6.9 // indirect
7668
github.com/google/go-cmp v0.5.9 // indirect
77-
github.com/google/go-github/v45 v45.2.0 // indirect
69+
github.com/google/go-github/v48 v48.2.0 // indirect
7870
github.com/google/go-querystring v1.1.0 // indirect
7971
github.com/google/gofuzz v1.2.0 // indirect
8072
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
@@ -86,10 +78,10 @@ require (
8678
github.com/inconshreveable/mousetrap v1.0.1 // indirect
8779
github.com/josharian/intern v1.0.0 // indirect
8880
github.com/json-iterator/go v1.1.12 // indirect
89-
github.com/magiconair/properties v1.8.6 // indirect
81+
github.com/magiconair/properties v1.8.7 // indirect
9082
github.com/mailru/easyjson v0.7.7 // indirect
91-
github.com/mattn/go-isatty v0.0.16 // indirect
92-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
83+
github.com/mattn/go-isatty v0.0.17 // indirect
84+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
9385
github.com/mitchellh/copystructure v1.2.0 // indirect
9486
github.com/mitchellh/mapstructure v1.5.0 // indirect
9587
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -100,47 +92,47 @@ require (
10092
github.com/opencontainers/go-digest v1.0.0 // indirect
10193
github.com/opencontainers/image-spec v1.0.2 // indirect
10294
github.com/pelletier/go-toml v1.9.5 // indirect
103-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
104-
github.com/prometheus/client_golang v1.13.0 // indirect
105-
github.com/prometheus/client_model v0.2.0 // indirect
95+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
96+
github.com/prometheus/client_golang v1.14.0 // indirect
97+
github.com/prometheus/client_model v0.3.0 // indirect
10698
github.com/prometheus/common v0.37.0 // indirect
10799
github.com/prometheus/procfs v0.8.0 // indirect
108100
github.com/shopspring/decimal v1.3.1 // indirect
109101
github.com/sirupsen/logrus v1.8.1 // indirect
110-
github.com/spf13/afero v1.9.2 // indirect
102+
github.com/spf13/afero v1.9.3 // indirect
111103
github.com/spf13/cast v1.5.0 // indirect
112104
github.com/spf13/cobra v1.6.1 // indirect
113105
github.com/spf13/jwalterweatherman v1.1.0 // indirect
114-
github.com/spf13/viper v1.13.0 // indirect
106+
github.com/spf13/viper v1.15.0 // indirect
115107
github.com/stoewer/go-strcase v1.2.0 // indirect
116-
github.com/subosito/gotenv v1.4.1 // indirect
117-
github.com/valyala/fastjson v1.6.3 // indirect
108+
github.com/subosito/gotenv v1.4.2 // indirect
109+
github.com/valyala/fastjson v1.6.4 // indirect
118110
github.com/vincent-petithory/dataurl v1.0.0 // indirect
119-
go.uber.org/atomic v1.7.0 // indirect
120-
go.uber.org/multierr v1.6.0 // indirect
121-
go.uber.org/zap v1.21.0 // indirect
111+
go.uber.org/atomic v1.9.0 // indirect
112+
go.uber.org/multierr v1.8.0 // indirect
113+
go.uber.org/zap v1.24.0 // indirect
122114
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
123115
golang.org/x/crypto v0.3.0 // indirect
124-
golang.org/x/net v0.8.0 // indirect
125-
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
126-
golang.org/x/sys v0.6.0 // indirect
127-
golang.org/x/term v0.6.0 // indirect
128-
golang.org/x/text v0.8.0 // indirect
129-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
130-
golang.org/x/tools v0.7.0 // indirect
116+
golang.org/x/net v0.9.0 // indirect
117+
golang.org/x/oauth2 v0.6.0 // indirect
118+
golang.org/x/sys v0.7.0 // indirect
119+
golang.org/x/term v0.7.0 // indirect
120+
golang.org/x/text v0.9.0 // indirect
121+
golang.org/x/time v0.3.0 // indirect
122+
golang.org/x/tools v0.8.0 // indirect
131123
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
132124
google.golang.org/appengine v1.6.7 // indirect
133-
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
125+
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
134126
google.golang.org/protobuf v1.28.1 // indirect
135127
gopkg.in/inf.v0 v0.9.1 // indirect
136128
gopkg.in/ini.v1 v1.67.0 // indirect
137129
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
138130
gopkg.in/yaml.v2 v2.4.0 // indirect
139-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
131+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
140132
k8s.io/cluster-bootstrap v0.25.0 // indirect
141-
k8s.io/component-base v0.25.4 // indirect
142-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
133+
k8s.io/component-base v0.26.1 // indirect
134+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
143135
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
144-
sigs.k8s.io/kind v0.17.0 // indirect
136+
sigs.k8s.io/kind v0.18.0 // indirect
145137
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
146138
)

0 commit comments

Comments
 (0)