Replace internal/generator by flux/pkg/kustomize

Signed-off-by: Soule BA <[email protected]>

controllers/kustomization_controller.go

@@ -31,6 +31,7 @@ import (
  apimeta "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/types"
  kerrors "k8s.io/apimachinery/pkg/util/errors"
  kuberecorder "k8s.io/client-go/tools/record"
@@ -62,8 +63,8 @@ import (
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
  "github.com/fluxcd/kustomize-controller/internal/decryptor"
- "github.com/fluxcd/kustomize-controller/internal/generator"
  "github.com/fluxcd/kustomize-controller/internal/inventory"
+ generator "github.com/fluxcd/pkg/kustomize"
 )
 
 // +kubebuilder:rbac:groups=kustomize.toolkit.fluxcd.io,resources=kustomizations,verbs=get;list;watch;create;update;patch;delete
@@ -366,14 +367,19 @@ func (r *KustomizationReconciler) reconcile(
  }
 
  // Generate kustomization.yaml if needed.
- err = r.generate(obj, tmpDir, dirPath)
+ k, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj)
+ if err != nil {
+ conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error())
+ return err
+ }
+ err = r.generate(unstructured.Unstructured{Object: k}, tmpDir, dirPath)
  if err != nil {
  conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error())
  return err
  }
 
  // Build the Kustomize overlay and decrypt secrets if needed.
- resources, err := r.build(ctx, obj, tmpDir, dirPath)
+ resources, err := r.build(ctx, obj, unstructured.Unstructured{Object: k}, tmpDir, dirPath)
  if err != nil {
  conditions.MarkFalse(obj, meta.ReadyCondition, kustomizev1.BuildFailedReason, err.Error())
  return err
@@ -548,14 +554,14 @@ func (r *KustomizationReconciler) getSource(ctx context.Context,
  return src, nil
 }
 
-func (r *KustomizationReconciler) generate(obj *kustomizev1.Kustomization,
+func (r *KustomizationReconciler) generate(obj unstructured.Unstructured,
  workDir string, dirPath string) error {
  _, err := generator.NewGenerator(workDir, obj).WriteFile(dirPath)
  return err
 }
 
 func (r *KustomizationReconciler) build(ctx context.Context,
- obj *kustomizev1.Kustomization,
+ obj *kustomizev1.Kustomization, u unstructured.Unstructured,
  workDir, dirPath string) ([]byte, error) {
  dec, cleanup, err := decryptor.NewTempDecryptor(workDir, r.Client, obj)
  if err != nil {
@@ -573,7 +579,7 @@ func (r *KustomizationReconciler) build(ctx context.Context,
  return nil, fmt.Errorf("error decrypting env sources: %w", err)
  }
 
- m, err := generator.Build(workDir, dirPath, !r.NoRemoteBases)
+ m, err := generator.SecureBuild(workDir, dirPath, !r.NoRemoteBases)
  if err != nil {
  return nil, fmt.Errorf("kustomize build failed: %w", err)
  }
@@ -601,7 +607,7 @@ func (r *KustomizationReconciler) build(ctx context.Context,
 
  // run variable substitutions
  if obj.Spec.PostBuild != nil {
- outRes, err := generator.SubstituteVariables(ctx, r.Client, obj, res)
+ outRes, err := generator.SubstituteVariables(ctx, r.Client, u, res, false)
  if err != nil {
  return nil, fmt.Errorf("var substitution failed for '%s': %w", res.GetName(), err)
  }

go.mod

@@ -4,6 +4,8 @@ go 1.18
 
 replace github.com/fluxcd/kustomize-controller/api => ./api
 
+replace github.com/fluxcd/pkg/kustomize => github.com/souleb/pkg/kustomize v0.0.0-20221114095525-547c3bceade1
+
 require (
  cloud.google.com/go/kms v1.4.0
  filippo.io/age v1.0.0
@@ -38,15 +40,15 @@ require (
  github.com/otiai10/copy v1.7.0
  github.com/spf13/pflag v1.0.5
  go.mozilla.org/sops/v3 v3.7.3
- golang.org/x/net v0.1.0
+ golang.org/x/net v0.2.0
  google.golang.org/api v0.100.0
  google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
  google.golang.org/grpc v1.50.1
  google.golang.org/protobuf v1.28.1
- k8s.io/api v0.25.3
- k8s.io/apiextensions-apiserver v0.25.3
- k8s.io/apimachinery v0.25.3
- k8s.io/client-go v0.25.3
+ k8s.io/api v0.25.4
+ k8s.io/apiextensions-apiserver v0.25.4
+ k8s.io/apimachinery v0.25.4
+ k8s.io/client-go v0.25.4
  sigs.k8s.io/cli-utils v0.33.0
  sigs.k8s.io/controller-runtime v0.13.1
  sigs.k8s.io/kustomize/api v0.12.1
@@ -98,8 +100,6 @@ require (
  github.com/Microsoft/go-winio v0.5.2 // indirect
  github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
  github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
- github.com/PuerkitoBio/purell v1.1.1 // indirect
- github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
  github.com/armon/go-metrics v0.3.10 // indirect
  github.com/armon/go-radix v1.0.0 // indirect
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 // indirect
@@ -120,25 +120,25 @@ require (
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/docker/go-connections v0.4.0 // indirect
  github.com/docker/go-units v0.4.0 // indirect
- github.com/emicklei/go-restful/v3 v3.8.0 // indirect
- github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+ github.com/emicklei/go-restful/v3 v3.10.0 // indirect
+ github.com/evanphx/json-patch v5.6.0+incompatible // indirect
  github.com/evanphx/json-patch/v5 v5.6.0 // indirect
  github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
  github.com/fatih/color v1.13.0 // indirect
  github.com/fsnotify/fsnotify v1.5.4 // indirect
- github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-errors/errors v1.4.2 // indirect
  github.com/go-logr/logr v1.2.3 // indirect
  github.com/go-logr/zapr v1.2.3 // indirect
  github.com/go-openapi/jsonpointer v0.19.5 // indirect
- github.com/go-openapi/jsonreference v0.19.5 // indirect
- github.com/go-openapi/swag v0.19.14 // indirect
+ github.com/go-openapi/jsonreference v0.20.0 // indirect
+ github.com/go-openapi/swag v0.22.3 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/golang/snappy v0.0.4 // indirect
  github.com/google/btree v1.0.1 // indirect
- github.com/google/gnostic v0.5.7-v3refs // indirect
+ github.com/google/gnostic v0.6.9 // indirect
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -166,15 +166,15 @@ require (
  github.com/hashicorp/vault/sdk v0.6.0 // indirect
  github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
  github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef // indirect
- github.com/imdario/mergo v0.3.12 // indirect
+ github.com/imdario/mergo v0.3.13 // indirect
  github.com/inconshreveable/mousetrap v1.0.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/kylelemons/godebug v1.1.0 // indirect
  github.com/lib/pq v1.10.5 // indirect
  github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
- github.com/mailru/easyjson v0.7.6 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
  github.com/mattn/go-colorable v0.1.12 // indirect
  github.com/mattn/go-isatty v0.0.14 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -209,16 +209,16 @@ require (
  github.com/xlab/treeprint v1.1.0 // indirect
  go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect
  go.opencensus.io v0.23.0 // indirect
- go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+ go.starlark.net v0.0.0-20221028183056-acb66ad56dd2 // indirect
  go.uber.org/atomic v1.9.0 // indirect
  go.uber.org/multierr v1.6.0 // indirect
  go.uber.org/zap v1.23.0 // indirect
  golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect
- golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
- golang.org/x/sys v0.1.0 // indirect
- golang.org/x/term v0.1.0 // indirect
+ golang.org/x/oauth2 v0.2.0 // indirect
+ golang.org/x/sys v0.2.0 // indirect
+ golang.org/x/term v0.2.0 // indirect
  golang.org/x/text v0.4.0 // indirect
- golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
+ golang.org/x/time v0.2.0 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
@@ -228,11 +228,11 @@ require (
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
  k8s.io/cli-runtime v0.25.2 // indirect
- k8s.io/component-base v0.25.3 // indirect
+ k8s.io/component-base v0.25.4 // indirect
  k8s.io/klog/v2 v2.80.1 // indirect
- k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+ k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
  k8s.io/kubectl v0.24.0 // indirect
- k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
  sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )