feat: add support for custom Velero plugins via EC config

pkg/addons/install.go

@@ -170,9 +170,10 @@ func GetAddOnsForInstall(opts InstallOptions) []types.AddOn {
 
 	if opts.DisasterRecoveryEnabled {
 		addOns = append(addOns, &velero.Velero{
-			Proxy:            opts.ProxySpec,
-			HostCABundlePath: opts.HostCABundlePath,
-			K0sDataDir:       opts.K0sDataDir,
+			Proxy:              opts.ProxySpec,
+			HostCABundlePath:   opts.HostCABundlePath,
+			K0sDataDir:         opts.K0sDataDir,
+			EmbeddedConfigSpec: opts.EmbeddedConfigSpec,
 		})
 	}
 
@@ -206,9 +207,10 @@ func GetAddOnsForRestore(opts RestoreOptions) []types.AddOn {
 			OpenEBSDataDir: opts.OpenEBSDataDir,
 		},
 		&velero.Velero{
-			Proxy:            opts.ProxySpec,
-			HostCABundlePath: opts.HostCABundlePath,
-			K0sDataDir:       opts.K0sDataDir,
+			Proxy:              opts.ProxySpec,
+			HostCABundlePath:   opts.HostCABundlePath,
+			K0sDataDir:         opts.K0sDataDir,
+			EmbeddedConfigSpec: opts.EmbeddedConfigSpec,
 		},
 	}
 	return addOns

pkg/addons/metadata.go

@@ -13,6 +13,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/registry"
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs"
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/velero"
+	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -78,7 +79,11 @@ func GenerateChartConfigs(ctx context.Context, kcli client.Client) ([]ecv1beta1.
 	repositories = append(repositories, repos...)
 
 	// velero
-	chart, repos, err = velero.GenerateChartConfig()
+	var ecConfig *ecv1beta1.ConfigSpec
+	if ecCfg := release.GetEmbeddedClusterConfig(); ecCfg != nil {
+		ecConfig = &ecCfg.Spec
+	}
+	chart, repos, err = velero.GenerateChartConfig(ecConfig)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "generate chart config for velero")
 	}

pkg/addons/upgrade.go

@@ -136,9 +136,10 @@ func (a *AddOns) getAddOnsForUpgrade(meta *ectypes.ReleaseMetadata, opts Upgrade
 
 	if opts.DisasterRecoveryEnabled {
 		addOns = append(addOns, &velero.Velero{
-			Proxy:            opts.ProxySpec,
-			HostCABundlePath: opts.HostCABundlePath,
-			K0sDataDir:       opts.K0sDataDir,
+			Proxy:              opts.ProxySpec,
+			HostCABundlePath:   opts.HostCABundlePath,
+			K0sDataDir:         opts.K0sDataDir,
+			EmbeddedConfigSpec: opts.EmbeddedConfigSpec,
 		})
 	}
 

pkg/addons/velero/metadata.go

@@ -48,8 +48,8 @@ func GetAdditionalImages() []string {
 	return images
 }
 
-func GenerateChartConfig() ([]ecv1beta1.Chart, []k0sv1beta1.Repository, error) {
-	hv, err := helmValues()
+func GenerateChartConfig(ecConfig *ecv1beta1.ConfigSpec) ([]ecv1beta1.Chart, []k0sv1beta1.Repository, error) {
+	hv, err := helmValues(ecConfig)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "get helm values")
 	}

pkg/addons/velero/values.go

@@ -19,7 +19,7 @@ var (
 )
 
 func (v *Velero) GenerateHelmValues(ctx context.Context, kcli client.Client, domains ecv1beta1.Domains, overrides []string) (map[string]interface{}, error) {
-	hv, err := helmValues()
+	hv, err := helmValues(v.EmbeddedConfigSpec)
 	if err != nil {
 		return nil, errors.Wrap(err, "get helm values")
 	}
@@ -112,11 +112,63 @@ func (v *Velero) GenerateHelmValues(ctx context.Context, kcli client.Client, dom
 	return copiedValues, nil
 }
 
-func helmValues() (map[string]interface{}, error) {
+func helmValues(ecConfig *ecv1beta1.ConfigSpec) (map[string]interface{}, error) {
 	hv, err := release.RenderHelmValues(rawvalues, Metadata)
 	if err != nil {
 		return nil, errors.Wrap(err, "render helm values")
 	}
 
+	// Inject custom Velero plugins from ConfigSpec if available
+	if err := injectPluginInitContainers(hv, ecConfig); err != nil {
+		return nil, errors.Wrap(err, "inject plugin init containers")
+	}
+
 	return hv, nil
 }
+
+// injectPluginInitContainers injects custom Velero plugin initContainers from ConfigSpec
+func injectPluginInitContainers(values map[string]interface{}, ecConfig *ecv1beta1.ConfigSpec) error {
+	if ecConfig == nil || len(ecConfig.Extensions.Velero.Plugins) == 0 {
+		return nil
+	}
+
+	allPlugins := ecConfig.Extensions.Velero.Plugins
+
+	// Get existing initContainers or create empty slice
+	var existingInitContainers []any
+	if existing, ok := values["initContainers"]; ok {
+		if containers, ok := existing.([]any); ok {
+			existingInitContainers = containers
+		}
+	}
+
+	// Process each plugin and create initContainer
+	for _, plugin := range allPlugins {
+		imagePullPolicy := plugin.ImagePullPolicy
+		if imagePullPolicy == "" {
+			imagePullPolicy = "IfNotPresent" // Default to match AWS plugin
+		}
+
+		initContainer := generatePluginContainer(plugin.Name, plugin.Image, imagePullPolicy)
+		existingInitContainers = append(existingInitContainers, initContainer)
+	}
+
+	// Update values with merged initContainers
+	values["initContainers"] = existingInitContainers
+	return nil
+}
+
+// generatePluginContainer creates an initContainer spec for a Velero plugin
+func generatePluginContainer(name, image, imagePullPolicy string) map[string]interface{} {
+	return map[string]interface{}{
+		"name":            name,
+		"image":           image,
+		"imagePullPolicy": imagePullPolicy,
+		"volumeMounts": []map[string]interface{}{
+			{
+				"mountPath": "/target",
+				"name":      "plugins",
+			},
+		},
+	}
+}