remove commenting code

kubernetes-sigs · Jan 25, 2022 · 7beb686 · 7beb686
1 parent 3b0a9a1
commit 7beb686
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go
@@ -129,26 +129,26 @@ func (kt *KustTarget) makeCustomizedResMap() (resmap.ResMap, error) {
 		return nil, err
 	}
 
-	// // The following steps must be done last, not as part of
-	// // the recursion implicit in AccumulateTarget.
-
-	// err = kt.addHashesToNames(ra)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// // Given that names have changed (prefixs/suffixes added),
-	// // fix all the back references to those names.
-	// err = ra.FixBackReferences()
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// // With all the back references fixed, it's OK to resolve Vars.
-	// err = ra.ResolveVars()
-	// if err != nil {
-	// 	return nil, err
-	// }
+	// The following steps must be done last, not as part of
+	// the recursion implicit in AccumulateTarget.
+
+	err = kt.addHashesToNames(ra)
+	if err != nil {
+		return nil, err
+	}
+
+	// Given that names have changed (prefixs/suffixes added),
+	// fix all the back references to those names.
+	err = ra.FixBackReferences()
+	if err != nil {
+		return nil, err
+	}
+
+	// With all the back references fixed, it's OK to resolve Vars.
+	err = ra.ResolveVars()
+	if err != nil {
+		return nil, err
+	}
 
 	return ra.ResMap(), nil
 }
@@ -221,19 +221,19 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (
 	if err != nil {
 		return nil, err
 	}
-	// err = kt.runValidators(ra)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// err = ra.MergeVars(kt.kustomization.Vars)
-	// if err != nil {
-	// 	return nil, errors.Wrapf(
-	// 		err, "merging vars %v", kt.kustomization.Vars)
-	// }
-	// err = kt.IgnoreLocal(ra)
-	// if err != nil {
-	// 	return nil, err
-	// }
+	err = kt.runValidators(ra)
+	if err != nil {
+		return nil, err
+	}
+	err = ra.MergeVars(kt.kustomization.Vars)
+	if err != nil {
+		return nil, errors.Wrapf(
+			err, "merging vars %v", kt.kustomization.Vars)
+	}
+	err = kt.IgnoreLocal(ra)
+	if err != nil {
+		return nil, err
+	}
 	return ra, nil
 }
 

diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go
@@ -194,7 +194,7 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 		}
 		c.Namespace = kt.kustomization.Namespace
 		c.FieldSpecs = tc.NameSpace
-		fmt.Printf("c.Namesapace: %s\n", c.Namespace)
+		fmt.Printf("c.Namespace: %s\n", c.Namespace)
 		// for i, spec := range c.FieldSpecs {
 		// 	fmt.Printf("c.FieldSpecs[%d]: %s\n", i, spec.String())
 		// }