Skip to content

Commit 93f03e6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11356 from dlipovetsky/public-test-builder-package
🌱 Make `internal/test/builder` package public (as `util/test/builder`)
2 parents 16232aa + febc6a9 commit 93f03e6

File tree

67 files changed

+448
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+448
-361
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
306306
output:crd:dir=./cmd/clusterctl/config/crd/bases
307307
$(KUSTOMIZE) build $(CLUSTERCTL_MANIFEST_DIR)/crd > $(CLUSTERCTL_MANIFEST_DIR)/manifest/clusterctl-api.yaml
308308
$(CONTROLLER_GEN) \
309-
paths=./internal/test/builder/... \
309+
paths=./util/test/builder/... \
310310
crd:crdVersions=v1 \
311-
output:crd:dir=./internal/test/builder/crd
311+
output:crd:dir=./util/test/builder/crd
312312

313313
.PHONY: generate-manifests-kubeadm-bootstrap
314314
generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm bootstrap
@@ -398,7 +398,7 @@ generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for co
398398
paths=./$(EXP_DIR)/runtime/hooks/api/... \
399399
paths=./internal/runtime/test/... \
400400
paths=./cmd/clusterctl/... \
401-
paths=./internal/test/builder/...
401+
paths=./util/test/builder/...
402402

403403
.PHONY: generate-go-deepcopy-kubeadm-bootstrap
404404
generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm bootstrap

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_reconciler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525

2626
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
27-
"sigs.k8s.io/cluster-api/internal/test/builder"
27+
"sigs.k8s.io/cluster-api/util/test/builder"
2828
)
2929

3030
func TestKubeadmConfigReconciler(t *testing.T) {

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ import (
4242
"sigs.k8s.io/cluster-api/controllers/clustercache"
4343
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4444
"sigs.k8s.io/cluster-api/feature"
45-
"sigs.k8s.io/cluster-api/internal/test/builder"
4645
"sigs.k8s.io/cluster-api/util"
4746
"sigs.k8s.io/cluster-api/util/certs"
4847
"sigs.k8s.io/cluster-api/util/conditions"
4948
"sigs.k8s.io/cluster-api/util/patch"
5049
"sigs.k8s.io/cluster-api/util/secret"
50+
"sigs.k8s.io/cluster-api/util/test/builder"
5151
utilyaml "sigs.k8s.io/cluster-api/util/yaml"
5252
)
5353

@@ -213,7 +213,8 @@ func TestKubeadmConfigReconciler_TestSecretOwnerReferenceReconciliation(t *testi
213213
Name: machine.Name,
214214
UID: machine.UID,
215215
Controller: ptr.To(true),
216-
}})
216+
},
217+
})
217218
g.Expect(myclient.Update(ctx, actual)).To(Succeed())
218219

219220
_, err = k.Reconcile(ctx, request)

‎cmd/clusterctl/client/cluster/objectgraph_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
3434
"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
35-
"sigs.k8s.io/cluster-api/internal/test/builder"
35+
"sigs.k8s.io/cluster-api/util/test/builder"
3636
)
3737

3838
func TestObjectGraph_getDiscoveryTypeMetaList(t *testing.T) {
@@ -1043,7 +1043,6 @@ var objectGraphsTests = []struct {
10431043
},
10441044
want: wantGraph{
10451045
nodes: map[string]wantGraphItem{
1046-
10471046
"infrastructure.cluster.x-k8s.io/v1beta1, Kind=GenericInfrastructureMachineTemplate, ns1/shared": {
10481047
owners: []string{
10491048
"cluster.x-k8s.io/v1beta1, Kind=Cluster, ns1/cluster1",
@@ -1638,7 +1637,6 @@ var objectGraphsTests = []struct {
16381637
// We need to deduplicate objects here as the clusterclasses share objects and
16391638
// setting up the test server panics if we try to create it with duplicate objects.
16401639
return deduplicateObjects(objs)
1641-
16421640
}(),
16431641
},
16441642
want: wantGraph{
@@ -1807,7 +1805,7 @@ func TestObjectGraph_DiscoveryByNamespace(t *testing.T) {
18071805
namespace string
18081806
objs []client.Object
18091807
}
1810-
var tests = []struct {
1808+
tests := []struct {
18111809
name string
18121810
args args
18131811
want wantGraph

‎cmd/clusterctl/internal/test/fake_objects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import (
3939
fakeinfrastructure "sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/infrastructure"
4040
addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
4141
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
42-
"sigs.k8s.io/cluster-api/internal/test/builder"
4342
"sigs.k8s.io/cluster-api/util"
43+
"sigs.k8s.io/cluster-api/util/test/builder"
4444
)
4545

4646
type FakeCluster struct {

‎controlplane/kubeadm/internal/controllers/controller_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import (
5454
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
5555
"sigs.k8s.io/cluster-api/feature"
5656
"sigs.k8s.io/cluster-api/internal/contract"
57-
"sigs.k8s.io/cluster-api/internal/test/builder"
5857
"sigs.k8s.io/cluster-api/internal/util/ssa"
5958
"sigs.k8s.io/cluster-api/internal/webhooks"
6059
"sigs.k8s.io/cluster-api/util"
@@ -65,6 +64,7 @@ import (
6564
"sigs.k8s.io/cluster-api/util/kubeconfig"
6665
"sigs.k8s.io/cluster-api/util/patch"
6766
"sigs.k8s.io/cluster-api/util/secret"
67+
"sigs.k8s.io/cluster-api/util/test/builder"
6868
)
6969

7070
func TestClusterToKubeadmControlPlane(t *testing.T) {
@@ -85,7 +85,8 @@ func TestClusterToKubeadmControlPlane(t *testing.T) {
8585
{
8686
NamespacedName: client.ObjectKey{
8787
Namespace: cluster.Spec.ControlPlaneRef.Namespace,
88-
Name: cluster.Spec.ControlPlaneRef.Name},
88+
Name: cluster.Spec.ControlPlaneRef.Name,
89+
},
8990
},
9091
}
9192

‎controlplane/kubeadm/internal/controllers/upgrade_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ import (
3434
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3535
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
3636
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
37-
"sigs.k8s.io/cluster-api/internal/test/builder"
3837
"sigs.k8s.io/cluster-api/internal/util/ssa"
3938
"sigs.k8s.io/cluster-api/util"
4039
"sigs.k8s.io/cluster-api/util/collections"
40+
"sigs.k8s.io/cluster-api/util/test/builder"
4141
)
4242

43-
const UpdatedVersion string = "v1.17.4"
44-
const Host string = "nodomain.example.com"
43+
const (
44+
UpdatedVersion string = "v1.17.4"
45+
Host string = "nodomain.example.com"
46+
)
4547

4648
func TestKubeadmControlPlaneReconciler_RolloutStrategy_ScaleUp(t *testing.T) {
4749
setup := func(t *testing.T, g *WithT) *corev1.Namespace {

‎docs/book/src/developer/core/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ easily readable, well documented and consistent across the code base.
7373

7474
In light of continuing improving our practice around this ambitious goal, we are starting to introduce a shared set of:
7575

76-
- Builders (`sigs.k8s.io/cluster-api/internal/test/builder`), allowing to create test objects in a simple and consistent way.
76+
- Builders (`sigs.k8s.io/cluster-api/util/test/builder`), allowing to create test objects in a simple and consistent way.
7777
- Matchers (`sigs.k8s.io/controller-runtime/pkg/envtest/komega`), improving how we write test assertions.
7878

7979
Each contribution in growing this set of utilities or their adoption across the codebase is more than welcome!

‎exp/internal/controllers/machinepool_controller_phases_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ import (
3939
"sigs.k8s.io/cluster-api/controllers/external"
4040
externalfake "sigs.k8s.io/cluster-api/controllers/external/fake"
4141
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
42-
"sigs.k8s.io/cluster-api/internal/test/builder"
4342
"sigs.k8s.io/cluster-api/internal/util/ssa"
4443
"sigs.k8s.io/cluster-api/util/kubeconfig"
4544
"sigs.k8s.io/cluster-api/util/labels/format"
45+
"sigs.k8s.io/cluster-api/util/test/builder"
4646
)
4747

4848
const (

‎exp/internal/controllers/machinepool_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ import (
4343
"sigs.k8s.io/cluster-api/controllers/external"
4444
externalfake "sigs.k8s.io/cluster-api/controllers/external/fake"
4545
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
46-
"sigs.k8s.io/cluster-api/internal/test/builder"
4746
"sigs.k8s.io/cluster-api/util"
4847
"sigs.k8s.io/cluster-api/util/conditions"
48+
"sigs.k8s.io/cluster-api/util/test/builder"
4949
)
5050

5151
func TestMachinePoolFinalizer(t *testing.T) {

0 commit comments

Comments
 (0)