feat: Allow nested defaults for args

pkg/deployment/external_args.go

@@ -45,7 +45,7 @@ func ConvertArgsToVars(args map[string]string) (*uo.UnstructuredObject, error) {
 	return vars, nil
 }
 
-func CheckRequiredDeployArgs(dir string, varsCtx *vars.VarsCtx, deployArgs *uo.UnstructuredObject) error {
+func LoadDeploymentArgs(dir string, varsCtx *vars.VarsCtx, deployArgs *uo.UnstructuredObject) error {
 	// First try to load the config without templating to avoid getting errors while rendering because required
 	// args were not set. Otherwise we won't be able to iterator through the 'args' array in the deployment.yml
 	// when the rendering error is actually args related.
@@ -69,6 +69,19 @@ func CheckRequiredDeployArgs(dir string, varsCtx *vars.VarsCtx, deployArgs *uo.U
 		return nil
 	}
 
+	// load defaults
+	defaults := uo.New()
+	for _, a := range conf.Args {
+		if a.Default != nil {
+			a2 := uo.FromMap(map[string]interface{}{
+				a.Name: a.Default,
+			})
+			defaults.Merge(a2)
+		}
+	}
+	defaults.Merge(deployArgs)
+	*deployArgs = *defaults
+
 	err = checkRequiredArgs(conf.Args, deployArgs)
 	if err != nil {
 		return err
@@ -86,11 +99,6 @@ func checkRequiredArgs(argsDef []*types.DeploymentArg, args *uo.UnstructuredObje
 		if !found {
 			if a.Default == nil {
 				return fmt.Errorf("required argument %s not set", a.Name)
-			} else {
-				err := args.SetNestedField(a.Default, p...)
-				if err != nil {
-					return err
-				}
 			}
 		}
 	}

pkg/kluctl_project/target_context.go

@@ -167,7 +167,7 @@ func (p *LoadedKluctlProject) buildVars(target *types.Target, clusterName *strin
 		}
 	}
 
-	err = deployment.CheckRequiredDeployArgs(p.DeploymentDir, varsCtx, allArgs)
+	err = deployment.LoadDeploymentArgs(p.DeploymentDir, varsCtx, allArgs)
 	if err != nil {
 		return doError(err)
 	}