Skip to content

Commit a4d339b

Browse files
authored
Merge pull request #676 from fluxcd/update-deps
2 parents 4a7d2f5 + 18b5935 commit a4d339b

8 files changed

+68
-63
lines changed

controllers/bucket_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func TestBucketReconciler_Reconcile(t *testing.T) {
128128

129129
// Check if the object status is valid.
130130
condns := &status.Conditions{NegativePolarity: bucketReadyCondition.NegativePolarity}
131-
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
131+
checker := status.NewChecker(testEnv.Client, condns)
132132
checker.CheckErr(ctx, obj)
133133

134134
// kstatus client conformance check.

controllers/gitrepository_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func TestGitRepositoryReconciler_Reconcile(t *testing.T) {
197197

198198
// Check if the object status is valid.
199199
condns := &status.Conditions{NegativePolarity: gitRepositoryReadyCondition.NegativePolarity}
200-
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
200+
checker := status.NewChecker(testEnv.Client, condns)
201201
checker.CheckErr(ctx, obj)
202202

203203
// kstatus client conformance check.

controllers/helmchart_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func TestHelmChartReconciler_Reconcile(t *testing.T) {
128128

129129
// Check if the object status is valid.
130130
condns := &status.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
131-
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
131+
checker := status.NewChecker(testEnv.Client, condns)
132132
checker.CheckErr(ctx, obj)
133133

134134
// kstatus client conformance check.

controllers/helmrepository_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func TestHelmRepositoryReconciler_Reconcile(t *testing.T) {
9999

100100
// Check if the object status is valid.
101101
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
102-
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
102+
checker := status.NewChecker(testEnv.Client, condns)
103103
checker.CheckErr(ctx, obj)
104104

105105
// kstatus client conformance check.

go.mod

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.17
55
replace github.com/fluxcd/source-controller/api => ./api
66

77
require (
8-
cloud.google.com/go/storage v1.21.0
8+
cloud.google.com/go/storage v1.22.0
99
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0
1010
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.2
1111
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0
@@ -14,13 +14,13 @@ require (
1414
// maintained by the ProtonMail team to continue to support the openpgp
1515
// module, after the Go team decided to no longer maintain it.
1616
// When in doubt (and not using openpgp), use /x/crypto.
17-
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f
17+
github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5
1818
github.com/cyphar/filepath-securejoin v0.2.3
19-
github.com/darkowlzz/controller-check v0.0.0-20220119215126-648356cef22c
19+
github.com/darkowlzz/controller-check v0.0.0-20220325122359-11f5827b7981
2020
github.com/docker/go-units v0.4.0
21-
github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac
21+
github.com/elazarl/goproxy v0.0.0-20220403042543-a53172b9392e
2222
github.com/fluxcd/pkg/apis/meta v0.12.2
23-
github.com/fluxcd/pkg/gittestserver v0.5.1
23+
github.com/fluxcd/pkg/gittestserver v0.5.2
2424
github.com/fluxcd/pkg/gitutil v0.1.0
2525
github.com/fluxcd/pkg/helmtestserver v0.7.2
2626
github.com/fluxcd/pkg/lockedfile v0.1.0
@@ -32,23 +32,23 @@ require (
3232
github.com/fluxcd/source-controller/api v0.23.0
3333
github.com/go-git/go-billy/v5 v5.3.1
3434
github.com/go-git/go-git/v5 v5.4.2
35-
github.com/go-logr/logr v1.2.2
35+
github.com/go-logr/logr v1.2.3
3636
github.com/google/uuid v1.3.0
3737
github.com/libgit2/git2go/v33 v33.0.9
38-
github.com/minio/minio-go/v7 v7.0.23
39-
github.com/onsi/gomega v1.18.1
38+
github.com/minio/minio-go/v7 v7.0.24
39+
github.com/onsi/gomega v1.19.0
4040
github.com/otiai10/copy v1.7.0
4141
github.com/spf13/pflag v1.0.5
42-
golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
42+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
4343
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
44-
google.golang.org/api v0.73.0
44+
google.golang.org/api v0.74.0
4545
gotest.tools v2.2.0+incompatible
4646
helm.sh/helm/v3 v3.8.2
4747
k8s.io/api v0.23.5
4848
k8s.io/apimachinery v0.23.5
4949
k8s.io/client-go v0.23.5
5050
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
51-
sigs.k8s.io/cli-utils v0.29.3
51+
sigs.k8s.io/cli-utils v0.29.4
5252
sigs.k8s.io/controller-runtime v0.11.2
5353
sigs.k8s.io/yaml v1.3.0
5454
)
@@ -73,7 +73,7 @@ replace github.com/containerd/containerd => github.com/containerd/containerd v1.
7373
require (
7474
cloud.google.com/go v0.100.2 // indirect
7575
cloud.google.com/go/compute v1.5.0 // indirect
76-
cloud.google.com/go/iam v0.1.1 // indirect
76+
cloud.google.com/go/iam v0.3.0 // indirect
7777
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
7878
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
7979
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
@@ -125,8 +125,9 @@ require (
125125
github.com/google/go-cmp v0.5.7 // indirect
126126
github.com/google/gofuzz v1.2.0 // indirect
127127
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
128-
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
128+
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
129129
github.com/googleapis/gnostic v0.5.5 // indirect
130+
github.com/googleapis/go-type-adapters v1.0.0 // indirect
130131
github.com/gorilla/mux v1.8.0 // indirect
131132
github.com/gosuri/uitable v0.0.4 // indirect
132133
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
@@ -199,18 +200,18 @@ require (
199200
go.uber.org/atomic v1.7.0 // indirect
200201
go.uber.org/multierr v1.6.0 // indirect
201202
go.uber.org/zap v1.21.0 // indirect
202-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
203+
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
203204
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
204-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
205+
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect
205206
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
206207
golang.org/x/text v0.3.7 // indirect
207208
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
208209
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
209210
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
210211
google.golang.org/appengine v1.6.7 // indirect
211-
google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect
212+
google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect
212213
google.golang.org/grpc v1.45.0 // indirect
213-
google.golang.org/protobuf v1.27.1 // indirect
214+
google.golang.org/protobuf v1.28.0 // indirect
214215
gopkg.in/gorp.v1 v1.7.2 // indirect
215216
gopkg.in/inf.v0 v0.9.1 // indirect
216217
gopkg.in/ini.v1 v1.66.2 // indirect

0 commit comments

Comments
 (0)