feat: Do not use default values in the Kubernetes yamls

assets/built-in/transformers/kubernetes/argocd/transformer.yaml

@@ -17,3 +17,6 @@ spec:
   produces:
     KubernetesYamls:
       disabled: false
+  config:
+    outputPath: "deploy/cicd/argocd"
+    useDefaultValuesInYamls: false

assets/built-in/transformers/kubernetes/buildconfig/transformer.yaml

@@ -17,3 +17,6 @@ spec:
   dependency:
     matchLabels:
       move2kube.konveyor.io/kubernetesclusterselector: "true"
+  config:
+    outputPath: "deploy/cicd/buildconfig"
+    useDefaultValuesInYamls: false

assets/built-in/transformers/kubernetes/knative/transformer.yaml

@@ -17,3 +17,6 @@ spec:
   dependency:
     matchLabels:
       move2kube.konveyor.io/kubernetesclusterselector: "true"
+  config:
+    outputPath: "deploy/knative"
+    useDefaultValuesInYamls: false

assets/built-in/transformers/kubernetes/kubernetes/transformer.yaml

@@ -20,3 +20,4 @@ spec:
   config:
     outputPath: "deploy/yamls"
     ingressName: "{{ .ProjectName }}"
+    useDefaultValuesInK8sYamls: false

assets/built-in/transformers/kubernetes/kubernetesversionchanger/transformer.yaml

@@ -20,3 +20,4 @@ spec:
       move2kube.konveyor.io/kubernetesclusterselector: "true"
   config:
     outputPath: "{{ $rel := Rel .YamlsPath }}source/{{ $rel }}{{ if ne $rel \".\" }}/..{{end}}/{{ FilePathBase .YamlsPath }}-versionchanged/"
+    useDefaultValuesInYamls: false

assets/built-in/transformers/kubernetes/tekton/transformer.yaml

@@ -17,3 +17,6 @@ spec:
   produces:
     KubernetesYamls:
       disabled: false
+  config:
+    outputPath: "deploy/cicd/tekton"
+    useDefaultValuesInYamls: false

transformer/kubernetes/apiresource/utils.go

@@ -34,7 +34,7 @@ import (
 )
 
 // TransformIRAndPersist transforms IR to yamls and writes to filesystem
-func TransformIRAndPersist(ir irtypes.EnhancedIR, outputPath string, apis []IAPIResource, targetCluster collecttypes.ClusterMetadata) (files []string, err error) {
+func TransformIRAndPersist(ir irtypes.EnhancedIR, outputPath string, apis []IAPIResource, targetCluster collecttypes.ClusterMetadata, useDefaultValsInYamls bool) (files []string, err error) {
 	logrus.Trace("TransformIRAndPersist start")
 	defer logrus.Trace("TransformIRAndPersist end")
 	targetObjs := []runtime.Object{}
@@ -46,7 +46,7 @@ func TransformIRAndPersist(ir irtypes.EnhancedIR, outputPath string, apis []IAPI
 		return nil, fmt.Errorf("failed to create the deploy directory at path '%s' . Error: %w", outputPath, err)
 	}
 	logrus.Debugf("Total %d services to be serialized.", len(targetObjs))
-	convertedObjs, err := convertVersion(targetObjs, targetCluster.Spec)
+	convertedObjs, err := convertVersion(targetObjs, targetCluster.Spec, useDefaultValsInYamls)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fix, convert and transform the objects. Error: %w", err)
 	}
@@ -58,7 +58,7 @@ func TransformIRAndPersist(ir irtypes.EnhancedIR, outputPath string, apis []IAPI
 }
 
 // TransformObjsAndPersist transforms versions of yamls in current directory and writes to filesystem
-func TransformObjsAndPersist(inputPath, outputPath string, apis []IAPIResource, targetCluster collecttypes.ClusterMetadata) (files []string, err error) {
+func TransformObjsAndPersist(inputPath, outputPath string, apis []IAPIResource, targetCluster collecttypes.ClusterMetadata, useDefaultValsInYamls bool) (files []string, err error) {
 	targetObjs := []runtime.Object{}
 	if pendingObjs := k8sschema.GetKubernetesObjsInDir(inputPath); len(pendingObjs) != 0 {
 		for _, apiResource := range apis {
@@ -72,7 +72,7 @@ func TransformObjsAndPersist(inputPath, outputPath string, apis []IAPIResource,
 		logrus.Errorf("failed to create deploy directory at path '%s' . Error: %q", outputPath, err)
 	}
 	logrus.Debugf("Total %d services to be serialized.", len(targetObjs))
-	convertedObjs, err := convertVersion(targetObjs, targetCluster.Spec)
+	convertedObjs, err := convertVersion(targetObjs, targetCluster.Spec, useDefaultValsInYamls)
 	if err != nil {
 		logrus.Errorf("Failed to fix, convert and transform the objects. Error: %q", err)
 	}
@@ -105,11 +105,11 @@ func writeObjects(outputPath string, objs []runtime.Object) ([]string, error) {
 	return filesWritten, nil
 }
 
-func convertVersion(objs []runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec) ([]runtime.Object, error) {
+func convertVersion(objs []runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec, useDefaultValsInYamls bool) ([]runtime.Object, error) {
 	newobjs := []runtime.Object{}
 	for _, obj := range objs {
 		fixedobj := fixer.Fix(obj)
-		newobj, err := k8sschema.ConvertToSupportedVersion(fixedobj, clusterSpec)
+		newobj, err := k8sschema.ConvertToSupportedVersion(fixedobj, clusterSpec, useDefaultValsInYamls)
 		if err != nil {
 			logrus.Errorf("failed to convert to supported version. Writing as is. Error: %q", err)
 			newobj = obj

transformer/kubernetes/argocdtransformer.go

@@ -41,7 +41,8 @@ type ArgoCD struct {
 
 // ArgoCDYamlConfig stores the ArgoCD related information
 type ArgoCDYamlConfig struct {
-	OutputPath string `yaml:"outputPath"`
+	OutputPath              string `yaml:"outputPath"`
+	UseDefaultValuesInYamls bool   `yaml:"useDefaultValuesInYamls"`
 }
 
 const (
@@ -60,6 +61,9 @@ func (t *ArgoCD) Init(tc transformertypes.Transformer, env *environment.Environm
 	if t.ArgoCDConfig.OutputPath == "" {
 		t.ArgoCDConfig.OutputPath = defaultArgoCDYamlsOutputPath
 	}
+	if !t.ArgoCDConfig.UseDefaultValuesInYamls {
+		t.ArgoCDConfig.UseDefaultValuesInYamls = useDefaultValuesInK8sYamls
+	}
 	return nil
 }
 
@@ -109,7 +113,7 @@ func (t *ArgoCD) Transform(newArtifacts []transformertypes.Artifact, alreadySeen
 		tempDest := filepath.Join(t.Env.TempPath, deployCICDDir)
 		logrus.Debugf("Generating ArgoCD yamls for CI/CD")
 		enhancedIR := t.setupEnhancedIR(ir, t.Env.GetProjectName())
-		files, err := apiresource.TransformIRAndPersist(enhancedIR, tempDest, resources, clusterConfig)
+		files, err := apiresource.TransformIRAndPersist(enhancedIR, tempDest, resources, clusterConfig, t.ArgoCDConfig.UseDefaultValuesInYamls)
 		if err != nil {
 			logrus.Errorf("failed to transform and persist IR. Error: %q", err)
 			continue

transformer/kubernetes/buildconfigtransformer.go

@@ -46,7 +46,8 @@ type BuildConfig struct {
 
 // BuildConfigYamlConfig stores the BuildConfig related information
 type BuildConfigYamlConfig struct {
-	OutputPath string `yaml:"outputPath"`
+	OutputPath              string `yaml:"outputPath"`
+	UseDefaultValuesInYamls bool   `yaml:"useDefaultValuesInYamls"`
 }
 
 const (
@@ -72,6 +73,9 @@ func (t *BuildConfig) Init(tc transformertypes.Transformer, env *environment.Env
 	if t.BuildConfigConfig.OutputPath == "" {
 		t.BuildConfigConfig.OutputPath = defaultBuildConfigYamlsOutputPath
 	}
+	if !t.BuildConfigConfig.UseDefaultValuesInYamls {
+		t.BuildConfigConfig.UseDefaultValuesInYamls = useDefaultValuesInK8sYamls
+	}
 	return nil
 }
 
@@ -120,7 +124,7 @@ func (t *BuildConfig) Transform(newArtifacts []transformertypes.Artifact, alread
 		tempDest := filepath.Join(t.Env.TempPath, deployCICDDir)
 		logrus.Infof("Generating Buildconfig pipeline for CI/CD")
 		enhancedIR := t.setupEnhancedIR(ir, t.Env.GetProjectName())
-		files, err := apiresource.TransformIRAndPersist(enhancedIR, tempDest, apis, clusterConfig)
+		files, err := apiresource.TransformIRAndPersist(enhancedIR, tempDest, apis, clusterConfig, t.BuildConfigConfig.UseDefaultValuesInYamls)
 		if err != nil {
 			logrus.Errorf("Unable to transform and persist IR : %s", err)
 			return nil, nil, err

transformer/kubernetes/k8sschema/converters.go

@@ -31,12 +31,12 @@ import (
 )
 
 // ConvertToSupportedVersion converts obj to a supported Version
-func ConvertToSupportedVersion(obj runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec) (runtime.Object, error) {
-	newobj, err := convertToSupportedVersion(obj, clusterSpec)
+func ConvertToSupportedVersion(obj runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec, useDefaultValsInYamls bool) (runtime.Object, error) {
+	newobj, err := convertToSupportedVersion(obj, clusterSpec, useDefaultValsInYamls)
 	if err != nil {
 		logrus.Debugf("Unable to transform object to a supported version : %s.", err)
 		if obj.GetObjectKind().GroupVersionKind().Version == core.SchemeGroupVersion.Version {
-			newobj, err = ConvertToPreferredVersion(obj, clusterSpec)
+			newobj, err = ConvertToPreferredVersion(obj, clusterSpec, useDefaultValsInYamls)
 			if err != nil {
 				logrus.Warnf("Unable to convert (%+v) to preferred version : %s", obj.GetObjectKind(), err)
 				newobj = obj
@@ -50,7 +50,7 @@ func ConvertToSupportedVersion(obj runtime.Object, clusterSpec collecttypes.Clus
 }
 
 // ConvertToSupportedVersion converts obj to a supported Version
-func convertToSupportedVersion(obj runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec) (newobj runtime.Object, err error) {
+func convertToSupportedVersion(obj runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec, useDefaultValsInYamls bool) (newobj runtime.Object, err error) {
 	objgvk := obj.GetObjectKind().GroupVersionKind()
 	objgv := objgvk.GroupVersion()
 	kind := objgvk.Kind
@@ -77,15 +77,19 @@ func convertToSupportedVersion(obj runtime.Object, clusterSpec collecttypes.Clus
 			logrus.Debugf("Unable to convert : %s", err)
 			continue
 		}
-		scheme.Default(newobj)
+		if useDefaultValsInYamls {
+			scheme.Default(newobj)
+		}
 		return newobj, err
 	}
-	scheme.Default(obj)
+	if useDefaultValsInYamls {
+		scheme.Default(obj)
+	}
 	return obj, fmt.Errorf("unable to convert to a supported version : %+v", obj.GetObjectKind())
 }
 
 // ConvertToPreferredVersion converts obj to a preferred Version
-func ConvertToPreferredVersion(obj runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec) (newobj runtime.Object, err error) {
+func ConvertToPreferredVersion(obj runtime.Object, clusterSpec collecttypes.ClusterMetadataSpec, useDefaultValsInYamls bool) (newobj runtime.Object, err error) {
 	objgvk := obj.GetObjectKind().GroupVersionKind()
 	objgv := objgvk.GroupVersion()
 	kind := objgvk.Kind
@@ -112,11 +116,15 @@ func ConvertToPreferredVersion(obj runtime.Object, clusterSpec collecttypes.Clus
 				logrus.Debugf("Unable to convert : %s", err)
 				continue
 			}
-			scheme.Default(newobj)
+			if useDefaultValsInYamls {
+				scheme.Default(newobj)
+			}
 			return newobj, err
 		}
 	}
-	scheme.Default(obj)
+	if useDefaultValsInYamls {
+		scheme.Default(obj)
+	}
 	return obj, fmt.Errorf("unable to convert to a preferred version : %+v", obj.GetObjectKind())
 }
 

transformer/kubernetes/knativetransformer.go

@@ -44,7 +44,8 @@ type Knative struct {
 
 // KnativeYamlConfig stores the knative related information
 type KnativeYamlConfig struct {
-	OutputPath string `yaml:"outputPath"`
+	OutputPath              string `yaml:"outputPath"`
+	UseDefaultValuesInYamls bool   `yaml:"useDefaultValuesInYamls"`
 }
 
 // Init Initializes the transformer
@@ -60,6 +61,9 @@ func (t *Knative) Init(tc transformertypes.Transformer, env *environment.Environ
 	if t.KnativeConfig.OutputPath == "" {
 		t.KnativeConfig.OutputPath = defaultKnativeYamlsOutputPath
 	}
+	if !t.KnativeConfig.UseDefaultValuesInYamls {
+		t.KnativeConfig.UseDefaultValuesInYamls = useDefaultValuesInK8sYamls
+	}
 	return nil
 }
 
@@ -105,7 +109,7 @@ func (t *Knative) Transform(newArtifacts []transformertypes.Artifact, alreadySee
 		logrus.Debugf("Starting Kubernetes transform")
 		logrus.Debugf("Total services to be transformed : %d", len(ir.Services))
 		apis := []apiresource.IAPIResource{&apiresource.KnativeService{}}
-		files, err := apiresource.TransformIRAndPersist(irtypes.NewEnhancedIRFromIR(ir), tempDest, apis, clusterConfig)
+		files, err := apiresource.TransformIRAndPersist(irtypes.NewEnhancedIRFromIR(ir), tempDest, apis, clusterConfig, t.KnativeConfig.UseDefaultValuesInYamls)
 		if err != nil {
 			logrus.Errorf("Unable to transform and persist IR : %s", err)
 			return nil, nil, err

transformer/kubernetes/kubernetestransformer.go

@@ -33,8 +33,9 @@ import (
 )
 
 const (
-	outputPathTemplateName    = "OutputPath"
-	defaultK8sYamlsOutputPath = common.DeployDir + string(os.PathSeparator) + "yamls"
+	outputPathTemplateName     = "OutputPath"
+	defaultK8sYamlsOutputPath  = common.DeployDir + string(os.PathSeparator) + "yamls"
+	useDefaultValuesInK8sYamls = false
 )
 
 // Kubernetes implements Transformer interface
@@ -46,8 +47,9 @@ type Kubernetes struct {
 
 // KubernetesYamlConfig stores the k8s related information
 type KubernetesYamlConfig struct {
-	IngressName string `yaml:"ingressName"`
-	OutputPath  string `yaml:"outputPath"`
+	IngressName                string `yaml:"ingressName"`
+	OutputPath                 string `yaml:"outputPath"`
+	UseDefaultValuesInK8sYamls bool   `yaml:"useDefaultValuesInK8sYamls"`
 }
 
 // KubernetesPathTemplateConfig implements Kubernetes template config interface
@@ -72,6 +74,9 @@ func (t *Kubernetes) Init(tc transformertypes.Transformer, e *environment.Enviro
 	if t.KubernetesConfig.OutputPath == "" {
 		t.KubernetesConfig.OutputPath = defaultK8sYamlsOutputPath
 	}
+	if !t.KubernetesConfig.UseDefaultValuesInK8sYamls {
+		t.KubernetesConfig.UseDefaultValuesInK8sYamls = useDefaultValuesInK8sYamls
+	}
 	return nil
 }
 
@@ -139,7 +144,7 @@ func (t *Kubernetes) Transform(newArtifacts []transformertypes.Artifact, already
 			new(apiresource.ImageStream),
 			new(apiresource.NetworkPolicy),
 		}
-		files, err := apiresource.TransformIRAndPersist(irtypes.NewEnhancedIRFromIR(ir), tempDest, apis, clusterConfig)
+		files, err := apiresource.TransformIRAndPersist(irtypes.NewEnhancedIRFromIR(ir), tempDest, apis, clusterConfig, t.KubernetesConfig.UseDefaultValuesInK8sYamls)
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to transform and persist the IR. Error: %w", err)
 		}

transformer/kubernetes/kubernetesversionchangertransformer.go

@@ -44,7 +44,8 @@ type KubernetesVersionChanger struct {
 
 // KubernetesVersionChangerYamlConfig stores the config
 type KubernetesVersionChangerYamlConfig struct {
-	OutputPath string `yaml:"outputPath"`
+	OutputPath              string `yaml:"outputPath"`
+	UseDefaultValuesInYamls bool   `yaml:"useDefaultValuesInYamls"`
 }
 
 // OutputPathParams stores the possible path params
@@ -66,6 +67,9 @@ func (t *KubernetesVersionChanger) Init(tc transformertypes.Transformer, e *envi
 	if t.KVCConfig.OutputPath == "" {
 		t.KVCConfig.OutputPath = defaultKVCOutputPath
 	}
+	if !t.KVCConfig.UseDefaultValuesInYamls {
+		t.KVCConfig.UseDefaultValuesInYamls = useDefaultValuesInK8sYamls
+	}
 	return nil
 }
 
@@ -123,7 +127,7 @@ func (t *KubernetesVersionChanger) Transform(newArtifacts []transformertypes.Art
 					return nil
 				}
 				if objs := k8sschema.GetKubernetesObjsInDir(path); len(objs) != 0 {
-					_, err := apiresource.TransformObjsAndPersist(path, filepath.Join(tempDest, relInputPath), apis, clusterConfig)
+					_, err := apiresource.TransformObjsAndPersist(path, filepath.Join(tempDest, relInputPath), apis, clusterConfig, t.KVCConfig.UseDefaultValuesInYamls)
 					if err != nil {
 						logrus.Errorf("Unable to transform objs at %s : %s", path, err)
 						return nil

transformer/kubernetes/tektontransformer.go

@@ -69,7 +69,8 @@ type Tekton struct {
 
 // TektonYamlConfig stores the Tekton related information
 type TektonYamlConfig struct {
-	OutputPath string `yaml:"outputPath"`
+	OutputPath              string `yaml:"outputPath"`
+	UseDefaultValuesInYamls bool   `yaml:"useDefaultValuesInYamls"`
 }
 
 // Init Initializes the transformer
@@ -85,6 +86,9 @@ func (t *Tekton) Init(tc transformertypes.Transformer, env *environment.Environm
 	if t.TektonConfig.OutputPath == "" {
 		t.TektonConfig.OutputPath = defaultTektonYamlsOutputPath
 	}
+	if !t.TektonConfig.UseDefaultValuesInYamls {
+		t.TektonConfig.UseDefaultValuesInYamls = useDefaultValuesInK8sYamls
+	}
 	return nil
 }
 
@@ -139,7 +143,7 @@ func (t *Tekton) Transform(newArtifacts []transformertypes.Artifact, alreadySeen
 		tempDest := filepath.Join(t.Env.TempPath, deployCICDDir)
 		logrus.Debugf("Generating Tekton pipeline for CI/CD")
 		enhancedIR := t.setupEnhancedIR(ir, t.Env.GetProjectName())
-		files, err := apiresource.TransformIRAndPersist(enhancedIR, tempDest, resources, clusterConfig)
+		files, err := apiresource.TransformIRAndPersist(enhancedIR, tempDest, resources, clusterConfig, t.TektonConfig.UseDefaultValuesInYamls)
 		if err != nil {
 			logrus.Errorf("Unable to transform and persist IR : %s", err)
 			return nil, nil, err