Skip to content

Commit d6858e6

Browse files
author
Per Goncalves da Silva
committed
remove mutators
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 1c462cc commit d6858e6

File tree

7 files changed

+5
-388
lines changed

7 files changed

+5
-388
lines changed

Diff for: internal/operator-controller/rukpak/convert/generate.go renamed to internal/operator-controller/rukpak/convert/generators.go

-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ func ChainedResourceGenerator(resourceGenerators ...ResourceGenerator) ResourceG
4545
}
4646
}
4747

48-
var BundleRBACResourceGenerator = ChainedResourceGenerator(
49-
BundleServiceAccountGenerator,
50-
BundlePermissionsGenerator,
51-
BundleClusterPermissionsGenerator,
52-
)
53-
5448
func BundleDeploymentGenerator(rv1 *RegistryV1, opts Options) ([]client.Object, error) {
5549
if rv1 == nil {
5650
return nil, fmt.Errorf("bundle cannot be nil")

Diff for: internal/operator-controller/rukpak/convert/mutate.go

-77
This file was deleted.

Diff for: internal/operator-controller/rukpak/convert/mutate_test.go

-179
This file was deleted.

Diff for: internal/operator-controller/rukpak/convert/registryv1.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ var PlainConverter = Converter{
220220
BundleRenderer: BundleRenderer{
221221
BundleValidator: RegistryV1BundleValidator,
222222
ResourceGenerators: []ResourceGenerator{
223-
BundleRBACResourceGenerator,
223+
BundleServiceAccountGenerator,
224+
BundlePermissionsGenerator,
225+
BundleClusterPermissionsGenerator,
224226
BundleCRDGenerator,
225227
BundleAdditionalResourcesGenerator,
226228
BundleDeploymentGenerator,

Diff for: internal/operator-controller/rukpak/convert/render.go

+2-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package convert
22

33
import (
44
"fmt"
5-
"slices"
65

76
"sigs.k8s.io/controller-runtime/pkg/client"
87

@@ -25,9 +24,8 @@ func (o *options) apply(opts ...Option) *options {
2524
}
2625

2726
type BundleRenderer struct {
28-
BundleValidator BundleValidator
29-
ResourceGenerators []ResourceGenerator
30-
ResourceMutatorFactories []ResourceMutatorFactory
27+
BundleValidator BundleValidator
28+
ResourceGenerators []ResourceGenerator
3129
}
3230

3331
func (r BundleRenderer) Render(rv1 RegistryV1, installNamespace string, watchNamespaces []string, opts ...Option) ([]client.Object, error) {
@@ -47,23 +45,12 @@ func (r BundleRenderer) Render(rv1 RegistryV1, installNamespace string, watchNam
4745
UniqueNameGenerator: renderOptions.UniqueNameGenerator,
4846
}
4947

50-
// generate object mutators
51-
objMutators, err := ChainedResourceMutatorFactory(r.ResourceMutatorFactories).MakeResourceMutators(&rv1, genOpts)
52-
if err != nil {
53-
return nil, err
54-
}
55-
5648
// generate bundle objects
5749
objs, err := ChainedResourceGenerator(r.ResourceGenerators...).GenerateResources(&rv1, genOpts)
5850
if err != nil {
5951
return nil, err
6052
}
6153

62-
// mutate objects
63-
if err := objMutators.MutateObjects(slices.Values(objs)); err != nil {
64-
return nil, err
65-
}
66-
6754
return objs, nil
6855
}
6956

0 commit comments

Comments
 (0)