diff --git a/go.mod b/go.mod index 8170fc9459..11a07144d3 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 github.com/operator-framework/api v0.42.0 - github.com/operator-framework/helm-operator-plugins v0.8.0 + github.com/operator-framework/helm-operator-plugins v0.9.0 github.com/operator-framework/operator-registry v1.68.0 github.com/prometheus/client_golang v1.23.2 github.com/prometheus/common v0.67.5 diff --git a/go.sum b/go.sum index e44962e931..3f111ef276 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,8 @@ github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5 github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/operator-framework/api v0.42.0 h1:rkc5V3zW8RxZMjePAe12jdL7Co/hwsYo1pLnkkhuR7s= github.com/operator-framework/api v0.42.0/go.mod h1:bMEj+wl/8tGqcGNtxt38cLUYagu9chNsbYzb/5HQaUQ= -github.com/operator-framework/helm-operator-plugins v0.8.0 h1:0f6HOQC5likkf0b/OvGvw7nhDb6h8Cj5twdCNjwNzMc= -github.com/operator-framework/helm-operator-plugins v0.8.0/go.mod h1:Sc+8bE38xTCgCChBUvtq/PxatEg9fAypr7S5iAw8nlA= +github.com/operator-framework/helm-operator-plugins v0.9.0 h1:eWscxLdNxB9rcECw+YWd8GqVegM9EZiRxoCJYtVbUlc= +github.com/operator-framework/helm-operator-plugins v0.9.0/go.mod h1:vKg3/yJAadHAXwRkU//uUruvdJaQm9XAIJq0+D5ABTw= github.com/operator-framework/operator-lib v0.19.0 h1:az6ogYj21rtU0SF9uYctRLyKp2dtlqTsmpfehFy6Ce8= github.com/operator-framework/operator-lib v0.19.0/go.mod h1:KxycAjFnHt0DBtHmH3Jm7yHcY5sdrshPKTqM/HKAQ08= github.com/operator-framework/operator-registry v1.68.0 h1:hsWR4o2a508xrc3DAalY4D/JGg7wnv6wjX+BTqXxSLI= diff --git a/internal/operator-controller/action/helm_test.go b/internal/operator-controller/action/helm_test.go index 3f1f02f9db..25f7f71950 100644 --- a/internal/operator-controller/action/helm_test.go +++ b/internal/operator-controller/action/helm_test.go @@ -9,6 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/release" "sigs.k8s.io/controller-runtime/pkg/client" @@ -70,6 +71,10 @@ func (m *mockActionClient) Reconcile(rel *release.Release) error { return args.Error(0) } +func (m *mockActionClient) Config() *action.Configuration { + return nil +} + var _ actionclient.ActionClientGetter = &mockActionClientGetter{} type mockActionClientGetter struct { diff --git a/internal/operator-controller/applier/helm_test.go b/internal/operator-controller/applier/helm_test.go index 25fad4d66b..3e3ef7479b 100644 --- a/internal/operator-controller/applier/helm_test.go +++ b/internal/operator-controller/applier/helm_test.go @@ -155,6 +155,10 @@ func (mag *mockActionGetter) Reconcile(rel *release.Release) error { return mag.reconcileErr } +func (mag *mockActionGetter) Config() *action.Configuration { + return nil +} + var ( // required for unmockable call to convert.RegistryV1ToHelmChart validFS = fstest.MapFS{ diff --git a/internal/operator-controller/controllers/clusterextension_controller_test.go b/internal/operator-controller/controllers/clusterextension_controller_test.go index 2726fe7c8c..4f524dd9a6 100644 --- a/internal/operator-controller/controllers/clusterextension_controller_test.go +++ b/internal/operator-controller/controllers/clusterextension_controller_test.go @@ -12,6 +12,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/storage/driver" @@ -2560,6 +2561,10 @@ func (mag *MockActionGetter) Reconcile(rel *release.Release) error { return nil } +func (mag *MockActionGetter) Config() *action.Configuration { + return nil +} + func TestGetInstalledBundleHistory(t *testing.T) { getter := controllers.HelmRevisionStatesGetter{}