Merge pull request #4300 from yuwenma/refactor-builtin

Move api/builtin to internal
kubernetes-sigs · Nov 23, 2021 · 25ee506 · 25ee506
2 parents de5210b + a1c5d79
commit 25ee506
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -127,7 +127,7 @@ install-tools: \
 #   module (it's linked into the api).
 
 # Where all generated builtin plugin code should go.
-pGen=api/builtins
+pGen=api/internal/builtins
 # Where the builtin Go plugin modules live.
 pSrc=plugin/builtin
 

diff --git a/api/builtins/builtins.go b/api/builtins/builtins.go
@@ -0,0 +1,49 @@
+// Copyright 2021 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Deprecated: Package api/builtins will not be available in API v1.
+package builtins
+
+import (
+	internal "sigs.k8s.io/kustomize/api/internal/builtins"
+)
+
+type (
+	AnnotationsTransformerPlugin         = internal.AnnotationsTransformerPlugin
+	ConfigMapGeneratorPlugin             = internal.ConfigMapGeneratorPlugin
+	HashTransformerPlugin                = internal.HashTransformerPlugin
+	HelmChartInflationGeneratorPlugin    = internal.HelmChartInflationGeneratorPlugin
+	IAMPolicyGeneratorPlugin             = internal.IAMPolicyGeneratorPlugin
+	ImageTagTransformerPlugin            = internal.ImageTagTransformerPlugin
+	LabelTransformerPlugin               = internal.LabelTransformerPlugin
+	LegacyOrderTransformerPlugin         = internal.LegacyOrderTransformerPlugin
+	NamespaceTransformerPlugin           = internal.NamespaceTransformerPlugin
+	PatchJson6902TransformerPlugin       = internal.PatchJson6902TransformerPlugin
+	PatchStrategicMergeTransformerPlugin = internal.PatchStrategicMergeTransformerPlugin
+	PatchTransformerPlugin               = internal.PatchTransformerPlugin
+	PrefixSuffixTransformerPlugin        = internal.PrefixSuffixTransformerPlugin
+	ReplacementTransformerPlugin         = internal.ReplacementTransformerPlugin
+	ReplicaCountTransformerPlugin        = internal.ReplicaCountTransformerPlugin
+	SecretGeneratorPlugin                = internal.SecretGeneratorPlugin
+	ValueAddTransformerPlugin            = internal.ValueAddTransformerPlugin
+)
+
+var (
+	NewAnnotationsTransformerPlugin         = internal.NewAnnotationsTransformerPlugin
+	NewConfigMapGeneratorPlugin             = internal.NewConfigMapGeneratorPlugin
+	NewHashTransformerPlugin                = internal.NewHashTransformerPlugin
+	NewHelmChartInflationGeneratorPlugin    = internal.NewHelmChartInflationGeneratorPlugin
+	NewIAMPolicyGeneratorPlugin             = internal.NewIAMPolicyGeneratorPlugin
+	NewImageTagTransformerPlugin            = internal.NewImageTagTransformerPlugin
+	NewLabelTransformerPlugin               = internal.NewLabelTransformerPlugin
+	NewLegacyOrderTransformerPlugin         = internal.NewLegacyOrderTransformerPlugin
+	NewNamespaceTransformerPlugin           = internal.NewNamespaceTransformerPlugin
+	NewPatchJson6902TransformerPlugin       = internal.NewPatchJson6902TransformerPlugin
+	NewPatchStrategicMergeTransformerPlugin = internal.NewPatchStrategicMergeTransformerPlugin
+	NewPatchTransformerPlugin               = internal.NewPatchTransformerPlugin
+	NewPrefixSuffixTransformerPlugin        = internal.NewPrefixSuffixTransformerPlugin
+	NewReplacementTransformerPlugin         = internal.NewReplacementTransformerPlugin
+	NewReplicaCountTransformerPlugin        = internal.NewReplicaCountTransformerPlugin
+	NewSecretGeneratorPlugin                = internal.NewSecretGeneratorPlugin
+	NewValueAddTransformerPlugin            = internal.NewValueAddTransformerPlugin
+)
diff --git a/api/builtins/AnnotationsTransformer.go → ...ternal/builtins/AnnotationsTransformer.go b/api/builtins/AnnotationsTransformer.go → ...ternal/builtins/AnnotationsTransformer.go
diff --git a/api/builtins/ConfigMapGenerator.go → api/internal/builtins/ConfigMapGenerator.go b/api/builtins/ConfigMapGenerator.go → api/internal/builtins/ConfigMapGenerator.go
diff --git a/api/builtins/HashTransformer.go → api/internal/builtins/HashTransformer.go b/api/builtins/HashTransformer.go → api/internal/builtins/HashTransformer.go
diff --git a/api/builtins/HelmChartInflationGenerator.go → ...l/builtins/HelmChartInflationGenerator.go b/api/builtins/HelmChartInflationGenerator.go → ...l/builtins/HelmChartInflationGenerator.go
diff --git a/api/builtins/IAMPolicyGenerator.go → api/internal/builtins/IAMPolicyGenerator.go b/api/builtins/IAMPolicyGenerator.go → api/internal/builtins/IAMPolicyGenerator.go
diff --git a/api/builtins/ImageTagTransformer.go → api/internal/builtins/ImageTagTransformer.go b/api/builtins/ImageTagTransformer.go → api/internal/builtins/ImageTagTransformer.go
diff --git a/api/builtins/LabelTransformer.go → api/internal/builtins/LabelTransformer.go b/api/builtins/LabelTransformer.go → api/internal/builtins/LabelTransformer.go
diff --git a/api/builtins/LegacyOrderTransformer.go → ...ternal/builtins/LegacyOrderTransformer.go b/api/builtins/LegacyOrderTransformer.go → ...ternal/builtins/LegacyOrderTransformer.go
diff --git a/api/builtins/NamespaceTransformer.go → ...internal/builtins/NamespaceTransformer.go b/api/builtins/NamespaceTransformer.go → ...internal/builtins/NamespaceTransformer.go
diff --git a/api/builtins/PatchJson6902Transformer.go → ...rnal/builtins/PatchJson6902Transformer.go b/api/builtins/PatchJson6902Transformer.go → ...rnal/builtins/PatchJson6902Transformer.go
diff --git a/...uiltins/PatchStrategicMergeTransformer.go → ...uiltins/PatchStrategicMergeTransformer.go b/...uiltins/PatchStrategicMergeTransformer.go → ...uiltins/PatchStrategicMergeTransformer.go
diff --git a/api/builtins/PatchTransformer.go → api/internal/builtins/PatchTransformer.go b/api/builtins/PatchTransformer.go → api/internal/builtins/PatchTransformer.go
diff --git a/api/builtins/PrefixSuffixTransformer.go → ...ernal/builtins/PrefixSuffixTransformer.go b/api/builtins/PrefixSuffixTransformer.go → ...ernal/builtins/PrefixSuffixTransformer.go
diff --git a/api/builtins/ReplacementTransformer.go → ...ternal/builtins/ReplacementTransformer.go b/api/builtins/ReplacementTransformer.go → ...ternal/builtins/ReplacementTransformer.go
diff --git a/api/builtins/ReplicaCountTransformer.go → ...ernal/builtins/ReplicaCountTransformer.go b/api/builtins/ReplicaCountTransformer.go → ...ernal/builtins/ReplicaCountTransformer.go
diff --git a/api/builtins/SecretGenerator.go → api/internal/builtins/SecretGenerator.go b/api/builtins/SecretGenerator.go → api/internal/builtins/SecretGenerator.go
diff --git a/api/builtins/ValueAddTransformer.go → api/internal/builtins/ValueAddTransformer.go b/api/builtins/ValueAddTransformer.go → api/internal/builtins/ValueAddTransformer.go
diff --git a/api/builtins/doc.go → api/internal/builtins/doc.go b/api/builtins/doc.go → api/internal/builtins/doc.go
diff --git a/api/internal/plugins/builtinhelpers/builtins.go b/api/internal/plugins/builtinhelpers/builtins.go
@@ -4,7 +4,7 @@
 package builtinhelpers
 
 import (
-	"sigs.k8s.io/kustomize/api/builtins"
+	"sigs.k8s.io/kustomize/api/internal/builtins"
 	"sigs.k8s.io/kustomize/api/resmap"
 )
 

diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"sigs.k8s.io/kustomize/api/builtins"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/internal/accumulator"
+	"sigs.k8s.io/kustomize/api/internal/builtins"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers"
 	"sigs.k8s.io/kustomize/api/internal/plugins/loader"

diff --git a/api/krusty/kustomizer.go b/api/krusty/kustomizer.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"sigs.k8s.io/kustomize/api/builtins"
+	"sigs.k8s.io/kustomize/api/internal/builtins"
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/internal/target"
 	"sigs.k8s.io/kustomize/api/konfig"

diff --git a/cmd/pluginator/internal/builtinplugin/builtinplugin.go b/cmd/pluginator/internal/builtinplugin/builtinplugin.go
@@ -141,7 +141,7 @@ func newWriter(r string) (*writer, error) {
 //   $HOME/kustomize/api/builtins
 func makeOutputFileName(root string) string {
 	return filepath.Join(
-		"..", "..", "..", "api", packageForGeneratedCode, root+".go")
+		"..", "..", "..", "api/internal", packageForGeneratedCode, root+".go")
 }
 
 func (w *writer) Close() error {