Support per-target kustomizeDir in kubernetes_multicluster plugin (#6718)

Signed-off-by: Mohammed Firdous <124298708+mohammedfirdouss@users.noreply.github.com>

Author: mohammedfirdouss

pkg/app/pipedv1/plugin/kubernetes_multicluster/deployment/plugin.go

@@ -89,12 +89,14 @@ func (p *Plugin) ExecuteStage(ctx context.Context, _ *sdk.ConfigNone, dts []*sdk
 }
 
 func (p *Plugin) loadManifests(ctx context.Context, deploy *sdk.Deployment, spec *kubeconfig.KubernetesApplicationSpec, deploymentSource *sdk.DeploymentSource[kubeconfig.KubernetesApplicationSpec], loader loader, logger *zap.Logger, multiTarget *kubeconfig.KubernetesMultiTarget) ([]provider.Manifest, error) {
-	// override values if multiTarget has value.
+	// Override manifest paths and kustomize directory from the per-target config if set.
 	manifestPathes := spec.Input.Manifests
+	kustomizeDir := ""
 	if multiTarget != nil {
 		if len(multiTarget.Manifests) > 0 {
 			manifestPathes = multiTarget.Manifests
 		}
+		kustomizeDir = multiTarget.KustomizeDir
 	}
 
 	manifests, err := loader.LoadManifests(ctx, provider.LoaderInput{
@@ -107,6 +109,7 @@ func (p *Plugin) loadManifests(ctx context.Context, deploy *sdk.Deployment, spec
 		Manifests:        manifestPathes,
 		Namespace:        spec.Input.Namespace,
 		KustomizeVersion: spec.Input.KustomizeVersion,
+		KustomizeDir:     kustomizeDir,
 		KustomizeOptions: spec.Input.KustomizeOptions,
 		HelmVersion:      spec.Input.HelmVersion,
 		HelmChart:        spec.Input.HelmChart,

pkg/app/pipedv1/plugin/kubernetes_multicluster/deployment/rollback.go

@@ -132,7 +132,6 @@ func (p *Plugin) rollback(ctx context.Context, input *sdk.ExecuteStageInput[kube
 
 	lp.Infof("Loading manifests at commit %s for handling", input.Request.RunningDeploymentSource.CommitHash)
 	toolRegistry := toolregistry.NewRegistry(input.Client.ToolRegistry())
-	// TODO: consider multiTarget later
 	manifests, err := p.loadManifests(ctx, &input.Request.Deployment, cfg.Spec, &input.Request.RunningDeploymentSource, provider.NewLoader(toolRegistry), input.Logger, multiTarget)
 	if err != nil {
 		lp.Errorf("Failed while loading manifests (%v)", err)

pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/loader.go

@@ -55,6 +55,7 @@ type LoaderInput struct {
 	Namespace string
 
 	KustomizeVersion string
+	KustomizeDir     string
 	KustomizeOptions map[string]string
 
 	HelmVersion string
@@ -85,12 +86,24 @@ func (l *Loader) determineTemplatingMethod(input LoaderInput) TemplatingMethod {
 	if input.HelmChart != nil {
 		return TemplatingMethodHelm
 	}
-	if isKustomizationFileExists(input.AppDir) {
+	if isKustomizationFileExists(resolveKustomizeDir(input.AppDir, input.KustomizeDir)) {
 		return TemplatingMethodKustomize
 	}
 	return TemplatingMethodNone
 }
 
+// resolveKustomizeDir returns the effective kustomize directory.
+// If kustomizeDir is empty, appDir is used. If kustomizeDir is relative, it is joined with appDir.
+func resolveKustomizeDir(appDir, kustomizeDir string) string {
+	if kustomizeDir == "" {
+		return appDir
+	}
+	if filepath.IsAbs(kustomizeDir) {
+		return kustomizeDir
+	}
+	return filepath.Join(appDir, kustomizeDir)
+}
+
 // isKustomizationFileExists checks if a kustomization file exists in the given directory.
 // There are 3 files name considered as kustomization file:
 // - kustomization.yaml
@@ -200,7 +213,7 @@ func (l *Loader) templateKustomizeManifests(ctx context.Context, input LoaderInp
 
 	k := NewKustomize(input.KustomizeVersion, kustomizePath, input.Logger)
 
-	return k.Template(ctx, input.AppName, input.AppDir, input.KustomizeOptions, h)
+	return k.Template(ctx, input.AppName, resolveKustomizeDir(input.AppDir, input.KustomizeDir), input.KustomizeOptions, h)
 }
 
 func LoadPlainYAMLManifests(dir string, names []string, configFilename string) ([]Manifest, error) {