Skip to content

Commit 35ea086

Browse files
darkowlzzdarkowlzz
authored
Merge pull request #932 from fluxcd/update-deps-oci-status-check
update dependencies
2 parents 5e83eca + df1894b commit 35ea086

File tree

9 files changed

+69
-66
lines changed

9 files changed

+69
-66
lines changed

‎controllers/bucket_controller_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ import (
2828
"testing"
2929
"time"
3030

31-
"github.com/darkowlzz/controller-check/status"
32-
"github.com/fluxcd/pkg/apis/meta"
33-
"github.com/fluxcd/pkg/runtime/conditions"
34-
"github.com/fluxcd/pkg/runtime/patch"
3531
. "github.com/onsi/gomega"
3632
corev1 "k8s.io/api/core/v1"
3733
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -42,6 +38,11 @@ import (
4238
"sigs.k8s.io/controller-runtime/pkg/client/fake"
4339
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
4440

41+
"github.com/fluxcd/pkg/apis/meta"
42+
"github.com/fluxcd/pkg/runtime/conditions"
43+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
44+
"github.com/fluxcd/pkg/runtime/patch"
45+
4546
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
4647
gcsmock "github.com/fluxcd/source-controller/internal/mock/gcs"
4748
s3mock "github.com/fluxcd/source-controller/internal/mock/s3"
@@ -127,8 +128,8 @@ func TestBucketReconciler_Reconcile(t *testing.T) {
127128
}, timeout).Should(BeTrue())
128129

129130
// Check if the object status is valid.
130-
condns := &status.Conditions{NegativePolarity: bucketReadyCondition.NegativePolarity}
131-
checker := status.NewChecker(testEnv.Client, condns)
131+
condns := &conditionscheck.Conditions{NegativePolarity: bucketReadyCondition.NegativePolarity}
132+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
132133
checker.CheckErr(ctx, obj)
133134

134135
// kstatus client conformance check.

‎controllers/gitrepository_controller_test.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ import (
2828
"testing"
2929
"time"
3030

31-
"github.com/darkowlzz/controller-check/status"
32-
"github.com/fluxcd/pkg/apis/meta"
33-
"github.com/fluxcd/pkg/gittestserver"
34-
"github.com/fluxcd/pkg/runtime/conditions"
35-
"github.com/fluxcd/pkg/runtime/patch"
36-
"github.com/fluxcd/pkg/ssh"
37-
"github.com/fluxcd/pkg/testserver"
3831
"github.com/go-git/go-billy/v5/memfs"
3932
gogit "github.com/go-git/go-git/v5"
4033
"github.com/go-git/go-git/v5/config"
@@ -56,6 +49,14 @@ import (
5649
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
5750
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
5851

52+
"github.com/fluxcd/pkg/apis/meta"
53+
"github.com/fluxcd/pkg/gittestserver"
54+
"github.com/fluxcd/pkg/runtime/conditions"
55+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
56+
"github.com/fluxcd/pkg/runtime/patch"
57+
"github.com/fluxcd/pkg/ssh"
58+
"github.com/fluxcd/pkg/testserver"
59+
5960
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
6061
serror "github.com/fluxcd/source-controller/internal/error"
6162
"github.com/fluxcd/source-controller/internal/features"
@@ -203,8 +204,8 @@ func TestGitRepositoryReconciler_Reconcile(t *testing.T) {
203204
}, timeout).Should(BeTrue())
204205

205206
// Check if the object status is valid.
206-
condns := &status.Conditions{NegativePolarity: gitRepositoryReadyCondition.NegativePolarity}
207-
checker := status.NewChecker(testEnv.Client, condns)
207+
condns := &conditionscheck.Conditions{NegativePolarity: gitRepositoryReadyCondition.NegativePolarity}
208+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
208209
checker.CheckErr(ctx, obj)
209210

210211
// kstatus client conformance check.

‎controllers/helmchart_controller_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"testing"
3333
"time"
3434

35-
"github.com/darkowlzz/controller-check/status"
3635
. "github.com/onsi/gomega"
3736
hchart "helm.sh/helm/v3/pkg/chart"
3837
"helm.sh/helm/v3/pkg/chart/loader"
@@ -50,8 +49,10 @@ import (
5049
"github.com/fluxcd/pkg/apis/meta"
5150
"github.com/fluxcd/pkg/helmtestserver"
5251
"github.com/fluxcd/pkg/runtime/conditions"
52+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
5353
"github.com/fluxcd/pkg/runtime/patch"
5454
"github.com/fluxcd/pkg/testserver"
55+
5556
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
5657
serror "github.com/fluxcd/source-controller/internal/error"
5758
"github.com/fluxcd/source-controller/internal/helm/chart"
@@ -108,8 +109,8 @@ func TestHelmChartReconciler_Reconcile(t *testing.T) {
108109
}, timeout).Should(BeTrue())
109110

110111
// Check if the object status is valid.
111-
condns := &status.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
112-
checker := status.NewChecker(testEnv.Client, condns)
112+
condns := &conditionscheck.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
113+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
113114
checker.CheckErr(ctx, obj)
114115

115116
// kstatus client conformance check.
@@ -173,8 +174,8 @@ func TestHelmChartReconciler_Reconcile(t *testing.T) {
173174
}, timeout).Should(BeTrue())
174175

175176
// Check if the object status is valid.
176-
condns := &status.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
177-
checker := status.NewChecker(testEnv.Client, condns)
177+
condns := &conditionscheck.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
178+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
178179
checker.CheckErr(ctx, obj)
179180

180181
g.Expect(testEnv.Delete(ctx, obj)).To(Succeed())
@@ -208,8 +209,8 @@ func TestHelmChartReconciler_Reconcile(t *testing.T) {
208209
}, timeout).Should(BeTrue())
209210

210211
// Check if the object status is valid.
211-
condns := &status.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
212-
checker := status.NewChecker(testEnv.Client, condns)
212+
condns := &conditionscheck.Conditions{NegativePolarity: helmChartReadyCondition.NegativePolarity}
213+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
213214
checker.CheckErr(ctx, obj)
214215

215216
g.Expect(testEnv.Delete(ctx, obj)).To(Succeed())

‎controllers/helmrepository_controller_oci_test.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ import (
2121
"fmt"
2222
"testing"
2323

24-
"github.com/darkowlzz/controller-check/status"
25-
"github.com/fluxcd/pkg/apis/meta"
26-
"github.com/fluxcd/pkg/runtime/conditions"
27-
"github.com/fluxcd/pkg/runtime/patch"
28-
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
29-
"github.com/fluxcd/source-controller/internal/helm/registry"
3024
. "github.com/onsi/gomega"
3125
corev1 "k8s.io/api/core/v1"
3226
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -36,6 +30,14 @@ import (
3630
ctrl "sigs.k8s.io/controller-runtime"
3731
"sigs.k8s.io/controller-runtime/pkg/client"
3832
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
33+
34+
"github.com/fluxcd/pkg/apis/meta"
35+
"github.com/fluxcd/pkg/runtime/conditions"
36+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
37+
"github.com/fluxcd/pkg/runtime/patch"
38+
39+
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
40+
"github.com/fluxcd/source-controller/internal/helm/registry"
3941
)
4042

4143
func TestHelmRepositoryOCIReconciler_Reconcile(t *testing.T) {
@@ -128,8 +130,8 @@ func TestHelmRepositoryOCIReconciler_Reconcile(t *testing.T) {
128130
}, timeout).Should(BeTrue())
129131

130132
// Check if the object status is valid.
131-
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
132-
checker := status.NewChecker(testEnv.Client, condns)
133+
condns := &conditionscheck.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
134+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
133135
checker.CheckErr(ctx, obj)
134136

135137
// kstatus client conformance check.

‎controllers/helmrepository_controller_test.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ import (
2828
"testing"
2929
"time"
3030

31-
"github.com/darkowlzz/controller-check/status"
32-
"github.com/fluxcd/pkg/apis/meta"
33-
"github.com/fluxcd/pkg/helmtestserver"
34-
"github.com/fluxcd/pkg/runtime/conditions"
35-
"github.com/fluxcd/pkg/runtime/patch"
3631
. "github.com/onsi/gomega"
3732
helmgetter "helm.sh/helm/v3/pkg/getter"
3833
corev1 "k8s.io/api/core/v1"
@@ -44,6 +39,12 @@ import (
4439
"sigs.k8s.io/controller-runtime/pkg/client/fake"
4540
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
4641

42+
"github.com/fluxcd/pkg/apis/meta"
43+
"github.com/fluxcd/pkg/helmtestserver"
44+
"github.com/fluxcd/pkg/runtime/conditions"
45+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
46+
"github.com/fluxcd/pkg/runtime/patch"
47+
4748
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
4849
"github.com/fluxcd/source-controller/internal/helm/getter"
4950
"github.com/fluxcd/source-controller/internal/helm/repository"
@@ -101,8 +102,8 @@ func TestHelmRepositoryReconciler_Reconcile(t *testing.T) {
101102
}, timeout).Should(BeTrue())
102103

103104
// Check if the object status is valid.
104-
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
105-
checker := status.NewChecker(testEnv.Client, condns)
105+
condns := &conditionscheck.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
106+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
106107
checker.CheckErr(ctx, obj)
107108

108109
// kstatus client conformance check.
@@ -1165,8 +1166,8 @@ func TestHelmRepositoryReconciler_ReconcileTypeUpdatePredicateFilter(t *testing.
11651166
}, timeout).Should(BeTrue())
11661167

11671168
// Check if the object status is valid.
1168-
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
1169-
checker := status.NewChecker(testEnv.Client, condns)
1169+
condns := &conditionscheck.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
1170+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
11701171
checker.CheckErr(ctx, obj)
11711172

11721173
// kstatus client conformance check.
@@ -1217,8 +1218,8 @@ func TestHelmRepositoryReconciler_ReconcileTypeUpdatePredicateFilter(t *testing.
12171218
}, timeout).Should(BeTrue())
12181219

12191220
// Check if the object status is valid.
1220-
condns = &status.Conditions{NegativePolarity: helmRepositoryOCINegativeConditions}
1221-
checker = status.NewChecker(testEnv.Client, condns)
1221+
condns = &conditionscheck.Conditions{NegativePolarity: helmRepositoryOCINegativeConditions}
1222+
checker = conditionscheck.NewChecker(testEnv.Client, condns)
12221223
checker.CheckErr(ctx, obj)
12231224

12241225
g.Expect(testEnv.Delete(ctx, obj)).To(Succeed())
@@ -1282,8 +1283,8 @@ func TestHelmRepositoryReconciler_ReconcileSpecUpdatePredicateFilter(t *testing.
12821283
}, timeout).Should(BeTrue())
12831284

12841285
// Check if the object status is valid.
1285-
condns := &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
1286-
checker := status.NewChecker(testEnv.Client, condns)
1286+
condns := &conditionscheck.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
1287+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
12871288
checker.CheckErr(ctx, obj)
12881289

12891290
// kstatus client conformance check.
@@ -1314,8 +1315,8 @@ func TestHelmRepositoryReconciler_ReconcileSpecUpdatePredicateFilter(t *testing.
13141315
}, timeout).Should(BeTrue())
13151316

13161317
// Check if the object status is valid.
1317-
condns = &status.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
1318-
checker = status.NewChecker(testEnv.Client, condns)
1318+
condns = &conditionscheck.Conditions{NegativePolarity: helmRepositoryReadyCondition.NegativePolarity}
1319+
checker = conditionscheck.NewChecker(testEnv.Client, condns)
13191320
checker.CheckErr(ctx, obj)
13201321

13211322
g.Expect(testEnv.Delete(ctx, obj)).To(Succeed())

‎controllers/ocirepository_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"testing"
3838
"time"
3939

40-
"github.com/darkowlzz/controller-check/status"
4140
"github.com/google/go-containerregistry/pkg/authn"
4241
"github.com/google/go-containerregistry/pkg/crane"
4342
"github.com/google/go-containerregistry/pkg/registry"
@@ -60,6 +59,7 @@ import (
6059
"github.com/fluxcd/pkg/apis/meta"
6160
"github.com/fluxcd/pkg/oci"
6261
"github.com/fluxcd/pkg/runtime/conditions"
62+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
6363
"github.com/fluxcd/pkg/runtime/patch"
6464
"github.com/fluxcd/pkg/untar"
6565

@@ -224,8 +224,8 @@ func TestOCIRepository_Reconcile(t *testing.T) {
224224
}
225225

226226
// Check if the object status is valid
227-
condns := &status.Conditions{NegativePolarity: ociRepositoryReadyCondition.NegativePolarity}
228-
checker := status.NewChecker(testEnv.Client, condns)
227+
condns := &conditionscheck.Conditions{NegativePolarity: ociRepositoryReadyCondition.NegativePolarity}
228+
checker := conditionscheck.NewChecker(testEnv.Client, condns)
229229
checker.CheckErr(ctx, obj)
230230

231231
// kstatus client conformance check

‎go.mod‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,19 @@ require (
2424
// When in doubt (and not using openpgp), use /x/crypto.
2525
github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895
2626
github.com/cyphar/filepath-securejoin v0.2.3
27-
github.com/darkowlzz/controller-check v0.0.0-20220902134353-b2ee0ae3566c
2827
github.com/distribution/distribution/v3 v3.0.0-20220907155224-78b9c98c5c31
2928
github.com/docker/cli v20.10.18+incompatible
3029
github.com/docker/go-units v0.5.0
3130
github.com/elazarl/goproxy v0.0.0-20220901064549-fbd10ff4f5a1
3231
github.com/fluxcd/gitkit v0.6.0
33-
github.com/fluxcd/pkg/apis/meta v0.16.0
32+
github.com/fluxcd/pkg/apis/meta v0.17.0
3433
github.com/fluxcd/pkg/gittestserver v0.7.0
3534
github.com/fluxcd/pkg/gitutil v0.2.0
3635
github.com/fluxcd/pkg/helmtestserver v0.9.0
3736
github.com/fluxcd/pkg/lockedfile v0.1.0
3837
github.com/fluxcd/pkg/masktoken v0.2.0
39-
github.com/fluxcd/pkg/oci v0.11.0
40-
github.com/fluxcd/pkg/runtime v0.19.0
38+
github.com/fluxcd/pkg/oci v0.13.0
39+
github.com/fluxcd/pkg/runtime v0.21.0
4140
github.com/fluxcd/pkg/sourceignore v0.2.0
4241
github.com/fluxcd/pkg/ssh v0.6.0
4342
github.com/fluxcd/pkg/testserver v0.3.0
@@ -389,7 +388,7 @@ require (
389388
gopkg.in/yaml.v3 v3.0.1 // indirect
390389
k8s.io/apiextensions-apiserver v0.25.0 // indirect
391390
k8s.io/apiserver v0.25.0 // indirect
392-
k8s.io/cli-runtime v0.25.0 // indirect
391+
k8s.io/cli-runtime v0.25.2 // indirect
393392
k8s.io/component-base v0.25.2 // indirect
394393
k8s.io/klog/v2 v2.80.1 // indirect
395394
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect

‎go.sum‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,6 @@ github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X
424424
github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
425425
github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U=
426426
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
427-
github.com/darkowlzz/controller-check v0.0.0-20220902134353-b2ee0ae3566c h1:fhuDA5Xr1bCEJDVGMn2luGjS1aLhj48nPHUMVp5oA7Q=
428-
github.com/darkowlzz/controller-check v0.0.0-20220902134353-b2ee0ae3566c/go.mod h1:0G1Hgd/faRl0UANlS9s8bULzwcU1+8pY8pEmI61t9d8=
429427
github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
430428
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
431429
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -516,8 +514,8 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
516514
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
517515
github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
518516
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
519-
github.com/fluxcd/pkg/apis/meta v0.16.0 h1:6Mj9rB0TtvCeTe3IlQDc1i2DH75Oosea9yUqS7XafVg=
520-
github.com/fluxcd/pkg/apis/meta v0.16.0/go.mod h1:GrOVzWXiu22XjLNgLLe2EBYhQPqZetes5SIADb4bmHE=
517+
github.com/fluxcd/pkg/apis/meta v0.17.0 h1:Y2dfo1syHZDb9Mexjr2SWdcj1FnxnRXm015hEnhl6wU=
518+
github.com/fluxcd/pkg/apis/meta v0.17.0/go.mod h1:GrOVzWXiu22XjLNgLLe2EBYhQPqZetes5SIADb4bmHE=
521519
github.com/fluxcd/pkg/gittestserver v0.7.0 h1:PRVaEjeC/ePKTusB5Bx/ExM0P6bjroPdG6K2DO7YJUM=
522520
github.com/fluxcd/pkg/gittestserver v0.7.0/go.mod h1:WHqqZQfdePi5M/s1ONMTB4MigktqJhzAFJOZ0KTBw9Y=
523521
github.com/fluxcd/pkg/gitutil v0.2.0 h1:7vvXfq+Ur1/WXEejXY/b2haJ/2Uj5Et5v4V33l+ni1Q=
@@ -528,10 +526,10 @@ github.com/fluxcd/pkg/lockedfile v0.1.0 h1:YsYFAkd6wawMCcD74ikadAKXA4s2sukdxrn7w
528526
github.com/fluxcd/pkg/lockedfile v0.1.0/go.mod h1:EJLan8t9MiOcgTs8+puDjbE6I/KAfHbdvIy9VUgIjm8=
529527
github.com/fluxcd/pkg/masktoken v0.2.0 h1:HoSPTk4l1fz5Fevs2vVRvZGru33blfMwWSZKsHdfG/0=
530528
github.com/fluxcd/pkg/masktoken v0.2.0/go.mod h1:EA7GleAHL33kN6kTW06m5R3/Q26IyuGO7Ef/0CtpDI0=
531-
github.com/fluxcd/pkg/oci v0.11.0 h1:mMZmF1zwUpM/Nq77aHwhiDmiOhOy3KbbBx0ZS1rOycU=
532-
github.com/fluxcd/pkg/oci v0.11.0/go.mod h1:gsRwVj0gTwk9xF3PuPJQ4R+rv8UtT26Gi7r1XfyBw8A=
533-
github.com/fluxcd/pkg/runtime v0.19.0 h1:4lRlnZfJFhWvuaNWgNsAkPQg09633xCRCf9d0SgXIWk=
534-
github.com/fluxcd/pkg/runtime v0.19.0/go.mod h1:9Kh46LjwQeUu6o1DUQulLGyo5e5wfQxeFf4ONNobT3U=
529+
github.com/fluxcd/pkg/oci v0.13.0 h1:447gUqqh+QnvLt+JCuqu1CjDpsbJhmyB1eibbiH7gTQ=
530+
github.com/fluxcd/pkg/oci v0.13.0/go.mod h1:gsRwVj0gTwk9xF3PuPJQ4R+rv8UtT26Gi7r1XfyBw8A=
531+
github.com/fluxcd/pkg/runtime v0.21.0 h1:3u6z8M1fDJDGzyAUHWanWy7xF7xQnn7jl2wTzsvU3Pg=
532+
github.com/fluxcd/pkg/runtime v0.21.0/go.mod h1:Cm6jIhltzXIM3CRRY6SFASDn+z2m/1yPqOWwD73c3io=
535533
github.com/fluxcd/pkg/sourceignore v0.2.0 h1:ooNbIkfxqNB+KKiY4AU+/DxwzjIKIOWBRK1As5QFlug=
536534
github.com/fluxcd/pkg/sourceignore v0.2.0/go.mod h1:m9/q+YLMNSWjXns1n/5q3ucwzSSddti+D6ExbNaCo6s=
537535
github.com/fluxcd/pkg/ssh v0.6.0 h1:yRJ866obXCo0JseJCqlGKtF8cumioPcwIC6kMwf8Spg=
@@ -2443,8 +2441,8 @@ k8s.io/apimachinery v0.25.2 h1:WbxfAjCx+AeN8Ilp9joWnyJ6xu9OMeS/fsfjK/5zaQs=
24432441
k8s.io/apimachinery v0.25.2/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA=
24442442
k8s.io/apiserver v0.25.0 h1:8kl2ifbNffD440MyvHtPaIz1mw4mGKVgWqM0nL+oyu4=
24452443
k8s.io/apiserver v0.25.0/go.mod h1:BKwsE+PTC+aZK+6OJQDPr0v6uS91/HWxX7evElAH6xo=
2446-
k8s.io/cli-runtime v0.25.0 h1:XBnTc2Fi+w818jcJGzhiJKQuXl8479sZ4FhtV5hVJ1Q=
2447-
k8s.io/cli-runtime v0.25.0/go.mod h1:bHOI5ZZInRHhbq12OdUiYZQN8ml8aKZLwQgt9QlLINw=
2444+
k8s.io/cli-runtime v0.25.2 h1:XOx+SKRjBpYMLY/J292BHTkmyDffl/qOx3YSuFZkTuc=
2445+
k8s.io/cli-runtime v0.25.2/go.mod h1:OQx3+/0st6x5YpkkJQlEWLC73V0wHsOFMC1/roxV8Oc=
24482446
k8s.io/client-go v0.25.2 h1:SUPp9p5CwM0yXGQrwYurw9LWz+YtMwhWd0GqOsSiefo=
24492447
k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4=
24502448
k8s.io/component-base v0.25.2 h1:Nve/ZyHLUBHz1rqwkjXm/Re6IniNa5k7KgzxZpTfSQY=

‎internal/reconcile/summarize/summary_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"testing"
2424
"time"
2525

26-
"github.com/darkowlzz/controller-check/status"
2726
. "github.com/onsi/gomega"
2827
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2928
"k8s.io/apimachinery/pkg/runtime"
@@ -34,6 +33,7 @@ import (
3433

3534
"github.com/fluxcd/pkg/apis/meta"
3635
"github.com/fluxcd/pkg/runtime/conditions"
36+
conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check"
3737
"github.com/fluxcd/pkg/runtime/patch"
3838

3939
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -370,8 +370,8 @@ func TestSummarizeAndPatch(t *testing.T) {
370370
}
371371

372372
// Check if the object status is valid as per kstatus.
373-
condns := &status.Conditions{NegativePolarity: testReadyConditions.NegativePolarity}
374-
checker := status.NewChecker(client, condns)
373+
condns := &conditionscheck.Conditions{NegativePolarity: testReadyConditions.NegativePolarity}
374+
checker := conditionscheck.NewChecker(client, condns)
375375
checker.CheckErr(ctx, obj)
376376
})
377377
}

0 commit comments

Comments
 (0)