Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ require (
github.com/operator-framework/operator-registry v1.61.0
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/common v0.67.2
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
github.com/spf13/cobra v1.10.1
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
Expand Down Expand Up @@ -192,7 +193,6 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rubenv/sql-migrate v1.8.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sigstore/fulcio v1.7.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/applier/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ func (r *RegistryV1ManifestProvider) Get(bundleFS fs.FS, ext *ocv1.ClusterExtens
}
bundleConfig, err := bundle.UnmarshalConfig(bundleConfigBytes, rv1, ext.Spec.Namespace)
if err != nil {
return nil, fmt.Errorf("invalid bundle configuration: %w", err)
return nil, fmt.Errorf("invalid ClusterExtension configuration: %w", err)
}

if bundleConfig != nil && bundleConfig.WatchNamespace != nil {
if bundleConfig.WatchNamespace != nil {
opts = append(opts, render.WithTargetNamespaces(*bundleConfig.WatchNamespace))
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/operator-controller/applier/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func Test_RegistryV1ManifestProvider_Integration(t *testing.T) {

_, err := provider.Get(bundleFS, ext)
require.Error(t, err)
require.Contains(t, err.Error(), "invalid bundle configuration")
require.Contains(t, err.Error(), "invalid ClusterExtension configuration")
})

t.Run("returns rendered manifests", func(t *testing.T) {
Expand Down
Loading
Loading