Skip to content

Commit e9ae0c2

Browse files
darkowlzzhiddeco
darkowlzz
authored and
hiddeco
committed
Add kstatus client conformance tests
Use kstatus to compute the status of the objects. Signed-off-by: Sunny <[email protected]>
1 parent f72a28a commit e9ae0c2

File tree

6 files changed

+193
-45
lines changed

6 files changed

+193
-45
lines changed

‎controllers/bucket_controller_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
apierrors "k8s.io/apimachinery/pkg/api/errors"
4242
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4343
"k8s.io/client-go/tools/record"
44+
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
4445
"sigs.k8s.io/controller-runtime/pkg/client"
4546
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
4647

@@ -130,6 +131,13 @@ func TestBucketReconciler_Reconcile(t *testing.T) {
130131
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
131132
checker.CheckErr(ctx, obj)
132133

134+
// kstatus client conformance check.
135+
uo, err := patch.ToUnstructured(obj)
136+
g.Expect(err).ToNot(HaveOccurred())
137+
res, err := kstatus.Compute(uo)
138+
g.Expect(err).ToNot(HaveOccurred())
139+
g.Expect(res.Status).To(Equal(kstatus.CurrentStatus))
140+
133141
// Patch the object with reconcile request annotation.
134142
patchHelper, err := patch.NewHelper(obj, testEnv.Client)
135143
g.Expect(err).ToNot(HaveOccurred())

‎controllers/gitrepository_controller_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
"k8s.io/apimachinery/pkg/runtime"
4848
"k8s.io/client-go/tools/record"
4949
"k8s.io/utils/pointer"
50+
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
5051
ctrl "sigs.k8s.io/controller-runtime"
5152
"sigs.k8s.io/controller-runtime/pkg/client"
5253
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -195,6 +196,13 @@ func TestGitRepositoryReconciler_Reconcile(t *testing.T) {
195196
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
196197
checker.CheckErr(ctx, obj)
197198

199+
// kstatus client conformance check.
200+
u, err := patch.ToUnstructured(obj)
201+
g.Expect(err).ToNot(HaveOccurred())
202+
res, err := kstatus.Compute(u)
203+
g.Expect(err).ToNot(HaveOccurred())
204+
g.Expect(res.Status).To(Equal(kstatus.CurrentStatus))
205+
198206
// Patch the object with reconcile request annotation.
199207
patchHelper, err := patch.NewHelper(obj, testEnv.Client)
200208
g.Expect(err).ToNot(HaveOccurred())

‎controllers/helmchart_controller_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
apierrors "k8s.io/apimachinery/pkg/api/errors"
3636
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3737
"k8s.io/client-go/tools/record"
38+
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
3839
"sigs.k8s.io/controller-runtime/pkg/client"
3940
"sigs.k8s.io/controller-runtime/pkg/client/fake"
4041
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -129,6 +130,13 @@ func TestHelmChartReconciler_Reconcile(t *testing.T) {
129130
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
130131
checker.CheckErr(ctx, obj)
131132

133+
// kstatus client conformance check.
134+
u, err := patch.ToUnstructured(obj)
135+
g.Expect(err).ToNot(HaveOccurred())
136+
res, err := kstatus.Compute(u)
137+
g.Expect(err).ToNot(HaveOccurred())
138+
g.Expect(res.Status).To(Equal(kstatus.CurrentStatus))
139+
132140
// Patch the object with reconcile request annotation.
133141
patchHelper, err := patch.NewHelper(obj, testEnv.Client)
134142
g.Expect(err).ToNot(HaveOccurred())

‎controllers/helmrepository_controller_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
apierrors "k8s.io/apimachinery/pkg/api/errors"
3636
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3737
"k8s.io/client-go/tools/record"
38+
kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
3839
"sigs.k8s.io/controller-runtime/pkg/client"
3940
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
4041

@@ -97,6 +98,13 @@ func TestHelmRepositoryReconciler_Reconcile(t *testing.T) {
9798
checker := status.NewChecker(testEnv.Client, testEnv.GetScheme(), condns)
9899
checker.CheckErr(ctx, obj)
99100

101+
// kstatus client conformance check.
102+
u, err := patch.ToUnstructured(obj)
103+
g.Expect(err).ToNot(HaveOccurred())
104+
res, err := kstatus.Compute(u)
105+
g.Expect(err).ToNot(HaveOccurred())
106+
g.Expect(res.Status).To(Equal(kstatus.CurrentStatus))
107+
100108
// Patch the object with reconcile request annotation.
101109
patchHelper, err := patch.NewHelper(obj, testEnv.Client)
102110
g.Expect(err).ToNot(HaveOccurred())

‎go.mod

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/fluxcd/pkg/gitutil v0.1.0
1717
github.com/fluxcd/pkg/helmtestserver v0.4.0
1818
github.com/fluxcd/pkg/lockedfile v0.1.0
19-
github.com/fluxcd/pkg/runtime v0.13.0
19+
github.com/fluxcd/pkg/runtime v0.13.1
2020
github.com/fluxcd/pkg/ssh v0.2.0
2121
github.com/fluxcd/pkg/testserver v0.2.0
2222
github.com/fluxcd/pkg/untar v0.1.0
@@ -32,19 +32,20 @@ require (
3232
github.com/spf13/pflag v1.0.5
3333
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
3434
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
35-
google.golang.org/api v0.54.0
35+
google.golang.org/api v0.62.0
3636
gotest.tools v2.2.0+incompatible
3737
helm.sh/helm/v3 v3.7.2
3838
k8s.io/api v0.23.3
3939
k8s.io/apimachinery v0.23.3
4040
k8s.io/client-go v0.23.3
4141
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
42+
sigs.k8s.io/cli-utils v0.28.0
4243
sigs.k8s.io/controller-runtime v0.11.1
4344
sigs.k8s.io/yaml v1.3.0
4445
)
4546

4647
require (
47-
cloud.google.com/go v0.90.0 // indirect
48+
cloud.google.com/go v0.99.0 // indirect
4849
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4950
github.com/BurntSushi/toml v0.3.1 // indirect
5051
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
@@ -62,6 +63,7 @@ require (
6263
github.com/bugsnag/bugsnag-go v2.1.2+incompatible // indirect
6364
github.com/bugsnag/panicwrap v1.3.4 // indirect
6465
github.com/cespare/xxhash/v2 v2.1.2 // indirect
66+
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
6567
github.com/containerd/containerd v1.5.7 // indirect
6668
github.com/containerd/continuity v0.1.0 // indirect
6769
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -77,7 +79,7 @@ require (
7779
github.com/emirpasic/gods v1.12.0 // indirect
7880
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7981
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
80-
github.com/fatih/color v1.7.0 // indirect
82+
github.com/fatih/color v1.13.0 // indirect
8183
github.com/fluxcd/pkg/apis/acl v0.0.3 // indirect
8284
github.com/fsnotify/fsnotify v1.5.1 // indirect
8385
github.com/go-errors/errors v1.0.1 // indirect
@@ -96,12 +98,12 @@ require (
9698
github.com/google/gofuzz v1.2.0 // indirect
9799
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
98100
github.com/google/uuid v1.3.0 // indirect
99-
github.com/googleapis/gax-go/v2 v2.1.0 // indirect
101+
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
100102
github.com/googleapis/gnostic v0.5.5 // indirect
101103
github.com/gorilla/mux v1.8.0 // indirect
102104
github.com/gosuri/uitable v0.0.4 // indirect
103105
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
104-
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
106+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
105107
github.com/hashicorp/go-retryablehttp v0.6.8 // indirect
106108
github.com/huandu/xstrings v1.3.2 // indirect
107109
github.com/imdario/mergo v0.3.12 // indirect
@@ -110,7 +112,6 @@ require (
110112
github.com/jmoiron/sqlx v1.3.1 // indirect
111113
github.com/josharian/intern v1.0.0 // indirect
112114
github.com/json-iterator/go v1.1.12 // indirect
113-
github.com/jstemmer/go-junit-report v0.9.1 // indirect
114115
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
115116
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
116117
github.com/klauspost/compress v1.13.5 // indirect
@@ -121,8 +122,8 @@ require (
121122
github.com/lib/pq v1.10.0 // indirect
122123
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
123124
github.com/mailru/easyjson v0.7.6 // indirect
124-
github.com/mattn/go-colorable v0.0.9 // indirect
125-
github.com/mattn/go-isatty v0.0.4 // indirect
125+
github.com/mattn/go-colorable v0.1.12 // indirect
126+
github.com/mattn/go-isatty v0.0.14 // indirect
126127
github.com/mattn/go-runewidth v0.0.9 // indirect
127128
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
128129
github.com/minio/md5-simd v1.1.0 // indirect
@@ -156,8 +157,8 @@ require (
156157
github.com/shopspring/decimal v1.2.0 // indirect
157158
github.com/sirupsen/logrus v1.8.1 // indirect
158159
github.com/sosedoff/gitkit v0.2.1-0.20200818155723-72ebbcf5056d // indirect
159-
github.com/spf13/cast v1.3.1 // indirect
160-
github.com/spf13/cobra v1.2.1 // indirect
160+
github.com/spf13/cast v1.4.1 // indirect
161+
github.com/spf13/cobra v1.3.0 // indirect
161162
github.com/stretchr/testify v1.7.0 // indirect
162163
github.com/xanzy/ssh-agent v0.3.0 // indirect
163164
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
@@ -172,34 +173,31 @@ require (
172173
go.uber.org/atomic v1.7.0 // indirect
173174
go.uber.org/multierr v1.6.0 // indirect
174175
go.uber.org/zap v1.19.1 // indirect
175-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
176-
golang.org/x/mod v0.4.2 // indirect
177176
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
178177
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
179178
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
180179
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
181180
golang.org/x/text v0.3.7 // indirect
182181
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
183-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
184182
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
185183
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
186184
google.golang.org/appengine v1.6.7 // indirect
187-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
188-
google.golang.org/grpc v1.40.0 // indirect
185+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
186+
google.golang.org/grpc v1.42.0 // indirect
189187
google.golang.org/protobuf v1.27.1 // indirect
190188
gopkg.in/gorp.v1 v1.7.2 // indirect
191189
gopkg.in/inf.v0 v0.9.1 // indirect
192-
gopkg.in/ini.v1 v1.62.0 // indirect
190+
gopkg.in/ini.v1 v1.66.2 // indirect
193191
gopkg.in/warnings.v0 v0.1.2 // indirect
194192
gopkg.in/yaml.v2 v2.4.0 // indirect
195193
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
196194
k8s.io/apiextensions-apiserver v0.23.3 // indirect
197195
k8s.io/apiserver v0.23.3 // indirect
198-
k8s.io/cli-runtime v0.23.0 // indirect
196+
k8s.io/cli-runtime v0.23.2 // indirect
199197
k8s.io/component-base v0.23.3 // indirect
200198
k8s.io/klog/v2 v2.40.1 // indirect
201199
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
202-
k8s.io/kubectl v0.22.4 // indirect
200+
k8s.io/kubectl v0.23.2 // indirect
203201
oras.land/oras-go v0.4.0 // indirect
204202
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
205203
sigs.k8s.io/kustomize/api v0.10.1 // indirect

0 commit comments

Comments
 (0)