Skip to content

Commit 805043c

Browse files
fernando-villalbafernando-villalba
committed
Changing the defaults module name to resolver
1 parent 2c79c83 commit 805043c

File tree

10 files changed

+320
-270
lines changed

10 files changed

+320
-270
lines changed

‎pkg/cluster-handler/controller/multigrescluster/integration_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
multigresv1alpha1 "github.com/numtide/multigres-operator/api/v1alpha1"
2121
"github.com/numtide/multigres-operator/pkg/cluster-handler/controller/multigrescluster"
22-
"github.com/numtide/multigres-operator/pkg/defaults"
22+
"github.com/numtide/multigres-operator/pkg/resolver"
2323
"github.com/numtide/multigres-operator/pkg/testutil"
2424
)
2525

@@ -127,8 +127,8 @@ func TestMultigresClusterReconciliation(t *testing.T) {
127127
Etcd: &multigresv1alpha1.EtcdSpec{
128128
Image: "etcd:latest",
129129
Replicas: ptr.To(int32(3)), // Default from logic
130-
Storage: multigresv1alpha1.StorageSpec{Size: defaults.DefaultEtcdStorageSize},
131-
Resources: defaults.DefaultResourcesEtcd,
130+
Storage: multigresv1alpha1.StorageSpec{Size: resolver.DefaultEtcdStorageSize},
131+
Resources: resolver.DefaultResourcesEtcd,
132132
},
133133
},
134134
},
@@ -154,7 +154,7 @@ func TestMultigresClusterReconciliation(t *testing.T) {
154154
{
155155
Name: "multiadmin",
156156
Image: "admin:latest",
157-
Resources: defaults.DefaultResourcesAdmin,
157+
Resources: resolver.DefaultResourcesAdmin,
158158
},
159159
},
160160
},

‎pkg/cluster-handler/controller/multigrescluster/multigrescluster_controller.go‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"sigs.k8s.io/controller-runtime/pkg/log"
2020

2121
multigresv1alpha1 "github.com/numtide/multigres-operator/api/v1alpha1"
22-
"github.com/numtide/multigres-operator/pkg/defaults"
22+
"github.com/numtide/multigres-operator/pkg/resolver"
2323
)
2424

2525
const (
@@ -68,23 +68,24 @@ func (r *MultigresClusterReconciler) Reconcile(
6868
return ctrl.Result{}, nil
6969
}
7070

71-
// This now returns *defaults.Resolver
72-
resolver := defaults.NewResolver(r.Client, cluster.Namespace, cluster.Spec.TemplateDefaults)
71+
// This now returns *resolver.Resolver
72+
// Renamed variable to 'res' to avoid collision with package name 'resolver'
73+
res := resolver.NewResolver(r.Client, cluster.Namespace, cluster.Spec.TemplateDefaults)
7374

7475
// Apply defaults (in-memory) to ensure we have images/configs even if webhook didn't run
75-
resolver.PopulateClusterDefaults(cluster)
76+
res.PopulateClusterDefaults(cluster)
7677

77-
if err := r.reconcileGlobalComponents(ctx, cluster, resolver); err != nil {
78+
if err := r.reconcileGlobalComponents(ctx, cluster, res); err != nil {
7879
l.Error(err, "Failed to reconcile global components")
7980
return ctrl.Result{}, err
8081
}
8182

82-
if err := r.reconcileCells(ctx, cluster, resolver); err != nil {
83+
if err := r.reconcileCells(ctx, cluster, res); err != nil {
8384
l.Error(err, "Failed to reconcile cells")
8485
return ctrl.Result{}, err
8586
}
8687

87-
if err := r.reconcileDatabases(ctx, cluster, resolver); err != nil {
88+
if err := r.reconcileDatabases(ctx, cluster, res); err != nil {
8889
l.Error(err, "Failed to reconcile databases")
8990
return ctrl.Result{}, err
9091
}
@@ -147,12 +148,12 @@ func (r *MultigresClusterReconciler) checkChildrenDeleted(
147148
func (r *MultigresClusterReconciler) reconcileGlobalComponents(
148149
ctx context.Context,
149150
cluster *multigresv1alpha1.MultigresCluster,
150-
resolver *defaults.Resolver,
151+
res *resolver.Resolver,
151152
) error {
152-
if err := r.reconcileGlobalTopoServer(ctx, cluster, resolver); err != nil {
153+
if err := r.reconcileGlobalTopoServer(ctx, cluster, res); err != nil {
153154
return err
154155
}
155-
if err := r.reconcileMultiAdmin(ctx, cluster, resolver); err != nil {
156+
if err := r.reconcileMultiAdmin(ctx, cluster, res); err != nil {
156157
return err
157158
}
158159
return nil
@@ -161,19 +162,19 @@ func (r *MultigresClusterReconciler) reconcileGlobalComponents(
161162
func (r *MultigresClusterReconciler) reconcileGlobalTopoServer(
162163
ctx context.Context,
163164
cluster *multigresv1alpha1.MultigresCluster,
164-
resolver *defaults.Resolver,
165+
res *resolver.Resolver,
165166
) error {
166167
tplName := cluster.Spec.TemplateDefaults.CoreTemplate
167168
if cluster.Spec.GlobalTopoServer.TemplateRef != "" {
168169
tplName = cluster.Spec.GlobalTopoServer.TemplateRef
169170
}
170171

171-
tpl, err := resolver.ResolveCoreTemplate(ctx, tplName)
172+
tpl, err := res.ResolveCoreTemplate(ctx, tplName)
172173
if err != nil {
173174
return fmt.Errorf("failed to resolve topo template: %w", err)
174175
}
175176

176-
spec := defaults.ResolveGlobalTopo(&cluster.Spec.GlobalTopoServer, tpl)
177+
spec := resolver.ResolveGlobalTopo(&cluster.Spec.GlobalTopoServer, tpl)
177178
// If Etcd is nil, it means we are using External topology (or invalid config handled by validations).
178179
// We only create a TopoServer CR if we are managing Etcd.
179180
if spec.Etcd != nil {
@@ -185,7 +186,7 @@ func (r *MultigresClusterReconciler) reconcileGlobalTopoServer(
185186
},
186187
}
187188
if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, ts, func() error {
188-
// defaults.ResolveGlobalTopo guarantees spec.Etcd.Replicas is set
189+
// resolver.ResolveGlobalTopo guarantees spec.Etcd.Replicas is set
189190
ts.Spec.Etcd = &multigresv1alpha1.EtcdSpec{
190191
Image: spec.Etcd.Image,
191192
Replicas: spec.Etcd.Replicas,
@@ -203,20 +204,20 @@ func (r *MultigresClusterReconciler) reconcileGlobalTopoServer(
203204
func (r *MultigresClusterReconciler) reconcileMultiAdmin(
204205
ctx context.Context,
205206
cluster *multigresv1alpha1.MultigresCluster,
206-
resolver *defaults.Resolver,
207+
res *resolver.Resolver,
207208
) error {
208209
tplName := cluster.Spec.TemplateDefaults.CoreTemplate
209210
if cluster.Spec.MultiAdmin.TemplateRef != "" {
210211
tplName = cluster.Spec.MultiAdmin.TemplateRef
211212
}
212213

213-
tpl, err := resolver.ResolveCoreTemplate(ctx, tplName)
214+
tpl, err := res.ResolveCoreTemplate(ctx, tplName)
214215
if err != nil {
215216
return fmt.Errorf("failed to resolve admin template: %w", err)
216217
}
217218

218-
// defaults.ResolveMultiAdmin guarantees a non-nil spec with defaults applied
219-
spec := defaults.ResolveMultiAdmin(&cluster.Spec.MultiAdmin, tpl)
219+
// resolver.ResolveMultiAdmin guarantees a non-nil spec with defaults applied
220+
spec := resolver.ResolveMultiAdmin(&cluster.Spec.MultiAdmin, tpl)
220221

221222
deploy := &appsv1.Deployment{
222223
ObjectMeta: metav1.ObjectMeta{
@@ -229,7 +230,7 @@ func (r *MultigresClusterReconciler) reconcileMultiAdmin(
229230
},
230231
}
231232
if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, deploy, func() error {
232-
// defaults.ResolveMultiAdmin guarantees Replicas is set
233+
// resolver.ResolveMultiAdmin guarantees Replicas is set
233234
deploy.Spec.Replicas = spec.Replicas
234235
deploy.Spec.Selector = &metav1.LabelSelector{
235236
MatchLabels: map[string]string{"app": "multiadmin", "multigres.com/cluster": cluster.Name},
@@ -261,14 +262,14 @@ func (r *MultigresClusterReconciler) reconcileMultiAdmin(
261262
func (r *MultigresClusterReconciler) reconcileCells(
262263
ctx context.Context,
263264
cluster *multigresv1alpha1.MultigresCluster,
264-
resolver *defaults.Resolver,
265+
res *resolver.Resolver,
265266
) error {
266267
existingCells := &multigresv1alpha1.CellList{}
267268
if err := r.List(ctx, existingCells, client.InNamespace(cluster.Namespace), client.MatchingLabels{"multigres.com/cluster": cluster.Name}); err != nil {
268269
return fmt.Errorf("failed to list existing cells: %w", err)
269270
}
270271

271-
globalTopoRef, err := r.getGlobalTopoRef(ctx, cluster, resolver)
272+
globalTopoRef, err := r.getGlobalTopoRef(ctx, cluster, res)
272273
if err != nil {
273274
return fmt.Errorf("failed to get global topo ref: %w", err)
274275
}
@@ -283,12 +284,12 @@ func (r *MultigresClusterReconciler) reconcileCells(
283284
for _, cellCfg := range cluster.Spec.Cells {
284285
activeCellNames[cellCfg.Name] = true
285286

286-
tpl, err := resolver.ResolveCellTemplate(ctx, cellCfg.CellTemplate)
287+
tpl, err := res.ResolveCellTemplate(ctx, cellCfg.CellTemplate)
287288
if err != nil {
288289
return fmt.Errorf("failed to resolve cell template '%s': %w", cellCfg.CellTemplate, err)
289290
}
290291

291-
gatewaySpec, localTopoSpec := defaults.MergeCellConfig(tpl, cellCfg.Overrides, cellCfg.Spec)
292+
gatewaySpec, localTopoSpec := resolver.MergeCellConfig(tpl, cellCfg.Overrides, cellCfg.Spec)
292293

293294
cellCR := &multigresv1alpha1.Cell{
294295
ObjectMeta: metav1.ObjectMeta{
@@ -338,14 +339,14 @@ func (r *MultigresClusterReconciler) reconcileCells(
338339
func (r *MultigresClusterReconciler) reconcileDatabases(
339340
ctx context.Context,
340341
cluster *multigresv1alpha1.MultigresCluster,
341-
resolver *defaults.Resolver,
342+
res *resolver.Resolver,
342343
) error {
343344
existingTGs := &multigresv1alpha1.TableGroupList{}
344345
if err := r.List(ctx, existingTGs, client.InNamespace(cluster.Namespace), client.MatchingLabels{"multigres.com/cluster": cluster.Name}); err != nil {
345346
return fmt.Errorf("failed to list existing tablegroups: %w", err)
346347
}
347348

348-
globalTopoRef, err := r.getGlobalTopoRef(ctx, cluster, resolver)
349+
globalTopoRef, err := r.getGlobalTopoRef(ctx, cluster, res)
349350
if err != nil {
350351
return fmt.Errorf("failed to get global topo ref: %w", err)
351352
}
@@ -367,7 +368,7 @@ func (r *MultigresClusterReconciler) reconcileDatabases(
367368
resolvedShards := []multigresv1alpha1.ShardResolvedSpec{}
368369

369370
for _, shard := range tg.Shards {
370-
tpl, err := resolver.ResolveShardTemplate(ctx, shard.ShardTemplate)
371+
tpl, err := res.ResolveShardTemplate(ctx, shard.ShardTemplate)
371372
if err != nil {
372373
return fmt.Errorf(
373374
"failed to resolve shard template '%s': %w",
@@ -376,7 +377,7 @@ func (r *MultigresClusterReconciler) reconcileDatabases(
376377
)
377378
}
378379

379-
orch, pools := defaults.MergeShardConfig(tpl, shard.Overrides, shard.Spec)
380+
orch, pools := resolver.MergeShardConfig(tpl, shard.Overrides, shard.Spec)
380381

381382
// Default MultiOrch Cells if empty (Consensus safety)
382383
// If 'cells' is empty, it defaults to all cells where pools are defined.
@@ -448,22 +449,22 @@ func (r *MultigresClusterReconciler) reconcileDatabases(
448449
func (r *MultigresClusterReconciler) getGlobalTopoRef(
449450
ctx context.Context,
450451
cluster *multigresv1alpha1.MultigresCluster,
451-
resolver *defaults.Resolver,
452+
res *resolver.Resolver,
452453
) (multigresv1alpha1.GlobalTopoServerRef, error) {
453454
topoTplName := cluster.Spec.TemplateDefaults.CoreTemplate
454455
if cluster.Spec.GlobalTopoServer.TemplateRef != "" {
455456
topoTplName = cluster.Spec.GlobalTopoServer.TemplateRef
456457
}
457458

458-
topoTpl, err := resolver.ResolveCoreTemplate(ctx, topoTplName)
459+
topoTpl, err := res.ResolveCoreTemplate(ctx, topoTplName)
459460
if err != nil {
460461
return multigresv1alpha1.GlobalTopoServerRef{}, fmt.Errorf(
461462
"failed to resolve global topo template: %w",
462463
err,
463464
)
464465
}
465466

466-
topoSpec := defaults.ResolveGlobalTopo(&cluster.Spec.GlobalTopoServer, topoTpl)
467+
topoSpec := resolver.ResolveGlobalTopo(&cluster.Spec.GlobalTopoServer, topoTpl)
467468

468469
address := ""
469470
if topoSpec.Etcd != nil {

‎pkg/cluster-handler/go.mod‎

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25.0
55
require (
66
github.com/google/go-cmp v0.7.0
77
github.com/numtide/multigres-operator/api v0.0.0-20251224124005-355869230728
8-
github.com/numtide/multigres-operator/pkg/defaults v0.0.0-00010101000000-000000000000
8+
github.com/numtide/multigres-operator/pkg/resolver v0.0.0-00010101000000-000000000000
99
github.com/numtide/multigres-operator/pkg/testutil v0.0.0-20251214105213-458b940d04bd
1010
k8s.io/api v0.34.3
1111
k8s.io/apimachinery v0.34.3
@@ -14,59 +14,67 @@ require (
1414
)
1515

1616
require (
17+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
1718
github.com/beorn7/perks v1.0.1 // indirect
1819
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1920
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
21+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2122
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2223
github.com/fsnotify/fsnotify v1.9.0 // indirect
2324
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2425
github.com/go-logr/logr v1.4.3 // indirect
25-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
26-
github.com/go-openapi/jsonreference v0.20.2 // indirect
27-
github.com/go-openapi/swag v0.23.0 // indirect
26+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
27+
github.com/go-openapi/jsonreference v0.21.4 // indirect
28+
github.com/go-openapi/swag v0.25.4 // indirect
29+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
30+
github.com/go-openapi/swag/conv v0.25.4 // indirect
31+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
32+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
33+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
34+
github.com/go-openapi/swag/loading v0.25.4 // indirect
35+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
36+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
37+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
38+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
39+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
2840
github.com/gogo/protobuf v1.3.2 // indirect
2941
github.com/google/btree v1.1.3 // indirect
30-
github.com/google/gnostic-models v0.7.0 // indirect
42+
github.com/google/gnostic-models v0.7.1 // indirect
43+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
3144
github.com/google/uuid v1.6.0 // indirect
32-
github.com/josharian/intern v1.0.0 // indirect
3345
github.com/json-iterator/go v1.1.12 // indirect
34-
github.com/mailru/easyjson v0.7.7 // indirect
3546
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3647
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
3748
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
38-
github.com/onsi/ginkgo/v2 v2.25.3 // indirect
39-
github.com/onsi/gomega v1.38.3 // indirect
40-
github.com/pkg/errors v0.9.1 // indirect
4149
github.com/pmezard/go-difflib v1.0.0 // indirect
42-
github.com/prometheus/client_golang v1.22.0 // indirect
43-
github.com/prometheus/client_model v0.6.1 // indirect
44-
github.com/prometheus/common v0.62.0 // indirect
45-
github.com/prometheus/procfs v0.15.1 // indirect
46-
github.com/spf13/pflag v1.0.6 // indirect
50+
github.com/prometheus/client_golang v1.23.2 // indirect
51+
github.com/prometheus/client_model v0.6.2 // indirect
52+
github.com/prometheus/common v0.67.4 // indirect
53+
github.com/prometheus/procfs v0.19.2 // indirect
54+
github.com/spf13/pflag v1.0.10 // indirect
4755
github.com/x448/float16 v0.8.4 // indirect
48-
go.yaml.in/yaml/v2 v2.4.2 // indirect
56+
go.uber.org/automaxprocs v1.6.0 // indirect
57+
go.yaml.in/yaml/v2 v2.4.3 // indirect
4958
go.yaml.in/yaml/v3 v3.0.4 // indirect
50-
golang.org/x/net v0.43.0 // indirect
51-
golang.org/x/oauth2 v0.27.0 // indirect
52-
golang.org/x/sync v0.16.0 // indirect
53-
golang.org/x/sys v0.35.0 // indirect
54-
golang.org/x/term v0.34.0 // indirect
55-
golang.org/x/text v0.28.0 // indirect
56-
golang.org/x/time v0.9.0 // indirect
59+
golang.org/x/net v0.48.0 // indirect
60+
golang.org/x/oauth2 v0.34.0 // indirect
61+
golang.org/x/sync v0.19.0 // indirect
62+
golang.org/x/sys v0.39.0 // indirect
63+
golang.org/x/term v0.38.0 // indirect
64+
golang.org/x/text v0.32.0 // indirect
65+
golang.org/x/time v0.14.0 // indirect
5766
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
58-
google.golang.org/protobuf v1.36.7 // indirect
59-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
67+
google.golang.org/protobuf v1.36.11 // indirect
68+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
6069
gopkg.in/inf.v0 v0.9.1 // indirect
61-
gopkg.in/yaml.v3 v3.0.1 // indirect
62-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
6371
k8s.io/client-go v0.34.3 // indirect
6472
k8s.io/klog/v2 v2.130.1 // indirect
65-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
66-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
73+
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
74+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
6775
sigs.k8s.io/randfill v1.0.0 // indirect
68-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
76+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
6977
sigs.k8s.io/yaml v1.6.0 // indirect
7078
)
7179

72-
replace github.com/numtide/multigres-operator/pkg/defaults => ../defaults
80+
replace github.com/numtide/multigres-operator/pkg/resolver => ../resolver

0 commit comments

Comments
 (0)