(rukpak) extend bundle renderer to accept config opts

Introduce BundleConfig that contains InstallConfig and DeploymentConfig.

Author: anik120

internal/operator-controller/rukpak/convert/helm.go

@@ -17,12 +17,20 @@ type BundleToHelmChartConverter struct {
 	IsWebhookSupportEnabled bool
 }
 
-func (r *BundleToHelmChartConverter) ToHelmChart(bundle source.BundleSource, installNamespace string, watchNamespace string) (*chart.Chart, error) {
+func (r *BundleToHelmChartConverter) ToHelmChart(bundle source.BundleSource, installNamespace string, config map[string]interface{}) (*chart.Chart, error) {
 	rv1, err := bundle.GetBundle()
 	if err != nil {
 		return nil, err
 	}
 
+	var opts []render.Option
+
+	opts = append(opts, render.WithCertificateProvider(r.CertificateProvider))
+
+	if watchNs, exists := config["watchNamespace"]; exists {
+		opts = append(opts, render.WithTargetNamespaces(watchNs.([]string)...))
+	}
+
 	if len(rv1.CSV.Spec.APIServiceDefinitions.Owned) > 0 {
 		return nil, fmt.Errorf("unsupported bundle: apiServiceDefintions are not supported")
 	}
@@ -39,11 +47,7 @@ func (r *BundleToHelmChartConverter) ToHelmChart(bundle source.BundleSource, ins
 		return nil, fmt.Errorf("unsupported bundle: webhookDefinitions are not supported")
 	}
 
-	objs, err := r.BundleRenderer.Render(
-		rv1, installNamespace,
-		render.WithTargetNamespaces(watchNamespace),
-		render.WithCertificateProvider(r.CertificateProvider),
-	)
+	objs, err := r.BundleRenderer.Render(rv1, installNamespace, opts...)
 
 	if err != nil {
 		return nil, fmt.Errorf("error rendering bundle: %w", err)

internal/operator-controller/rukpak/convert/helm_test.go

@@ -24,7 +24,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_ReturnsBundleSourceFailures(t *
 	var failingBundleSource FakeBundleSource = func() (bundle.RegistryV1, error) {
 		return bundle.RegistryV1{}, errors.New("some error")
 	}
-	_, err := converter.ToHelmChart(failingBundleSource, "install-namespace", "watch-namespace")
+	_, err := converter.ToHelmChart(failingBundleSource, "install-namespace", map[string]interface{}{"watchNamespace": "watch-namespace"})
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "some error")
 }
@@ -46,7 +46,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_ReturnsBundleRendererFailures(t
 		},
 	)
 
-	_, err := converter.ToHelmChart(b, "install-namespace", "")
+	_, err := converter.ToHelmChart(b, "install-namespace", map[string]interface{}{"watchNamespace": ""})
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "some error")
 }
@@ -56,11 +56,14 @@ func Test_BundleToHelmChartConverter_ToHelmChart_NoAPIServiceDefinitions(t *test
 
 	b := source.FromBundle(
 		bundle.RegistryV1{
-			CSV: MakeCSV(WithOwnedAPIServiceDescriptions(v1alpha1.APIServiceDescription{})),
+			CSV: MakeCSV(
+				WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
+				WithOwnedAPIServiceDescriptions(v1alpha1.APIServiceDescription{}),
+			),
 		},
 	)
 
-	_, err := converter.ToHelmChart(b, "install-namespace", "")
+	_, err := converter.ToHelmChart(b, "install-namespace", map[string]interface{}{"watchNamespace": ""})
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "unsupported bundle: apiServiceDefintions are not supported")
 }
@@ -72,11 +75,14 @@ func Test_BundleToHelmChartConverter_ToHelmChart_NoWebhooksWithoutCertProvider(t
 
 	b := source.FromBundle(
 		bundle.RegistryV1{
-			CSV: MakeCSV(WithWebhookDefinitions(v1alpha1.WebhookDescription{})),
+			CSV: MakeCSV(
+				WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
+				WithWebhookDefinitions(v1alpha1.WebhookDescription{}),
+			),
 		},
 	)
 
-	_, err := converter.ToHelmChart(b, "install-namespace", "")
+	_, err := converter.ToHelmChart(b, "install-namespace", map[string]interface{}{"watchNamespace": ""})
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "webhookDefinitions are not supported")
 }
@@ -88,11 +94,14 @@ func Test_BundleToHelmChartConverter_ToHelmChart_WebhooksSupportDisabled(t *test
 
 	b := source.FromBundle(
 		bundle.RegistryV1{
-			CSV: MakeCSV(WithWebhookDefinitions(v1alpha1.WebhookDescription{})),
+			CSV: MakeCSV(
+				WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
+				WithWebhookDefinitions(v1alpha1.WebhookDescription{}),
+			),
 		},
 	)
 
-	_, err := converter.ToHelmChart(b, "install-namespace", "")
+	_, err := converter.ToHelmChart(b, "install-namespace", map[string]interface{}{"watchNamespace": ""})
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "webhookDefinitions are not supported")
 }
@@ -112,7 +121,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_WebhooksWithCertProvider(t *tes
 		},
 	)
 
-	_, err := converter.ToHelmChart(b, "install-namespace", "")
+	_, err := converter.ToHelmChart(b, "install-namespace", map[string]interface{}{"watchNamespace": ""})
 	require.NoError(t, err)
 }
 
@@ -142,7 +151,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_BundleRendererIntegration(t *te
 		},
 	)
 
-	_, err := converter.ToHelmChart(b, expectedInstallNamespace, expectedWatchNamespace)
+	_, err := converter.ToHelmChart(b, expectedInstallNamespace, map[string]interface{}{"watchNamespace": expectedWatchNamespace})
 	require.NoError(t, err)
 }
 
@@ -181,7 +190,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_Success(t *testing.T) {
 		},
 	)
 
-	chart, err := converter.ToHelmChart(b, "install-namespace", "")
+	chart, err := converter.ToHelmChart(b, "install-namespace", map[string]interface{}{"watchNamespace": ""})
 	require.NoError(t, err)
 	require.NotNil(t, chart)
 	require.NotNil(t, chart.Metadata)