diff --git a/components/workbenches/workbenches.go b/components/workbenches/workbenches.go index 24a2e150572..41598bf8dbb 100644 --- a/components/workbenches/workbenches.go +++ b/components/workbenches/workbenches.go @@ -2,6 +2,7 @@ package workbenches import ( + "github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh/io" "path/filepath" "strings" @@ -9,7 +10,6 @@ import ( "github.com/opendatahub-io/opendatahub-operator/v2/components" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy" - "github.com/opendatahub-io/opendatahub-operator/v2/pkg/servicemesh/io" operatorv1 "github.com/openshift/api/operator/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/feature/feature.go b/pkg/feature/feature.go index caa6b4a4722..28d2da492f8 100644 --- a/pkg/feature/feature.go +++ b/pkg/feature/feature.go @@ -4,6 +4,7 @@ import ( "context" "github.com/hashicorp/go-multierror" v1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1" + "github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh/io" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/gvr" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" @@ -168,13 +169,13 @@ func (f *Feature) apply(m manifest) error { applier = func(filename string) error { log.Info("patching using manifest", "feature", f.Name, "name", m.name, "path", targetPath) - return f.patchResourceFromFile(filename) + return io.PatchResourceFromFile(f.DynamicClient, log, filename) } } else { applier = func(filename string) error { log.Info("applying manifest", "feature", f.Name, "name", m.name, "path", targetPath) - return f.createResourceFromFile(filename) + return io.CreateResourceFromFile(f.Client, log, f.OwnerReference(), filename) } } diff --git a/pkg/feature/servicemesh/io/resources_unit_test.go b/pkg/feature/servicemesh/io/resources_unit_test.go index 311240c3a13..fc10b442cd3 100644 --- a/pkg/feature/servicemesh/io/resources_unit_test.go +++ b/pkg/feature/servicemesh/io/resources_unit_test.go @@ -3,7 +3,7 @@ package io_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opendatahub-io/opendatahub-operator/v2/pkg/servicemesh/io" + "github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature/servicemesh/io" "os" "path/filepath" )