Merge pull request #299 from yuwenma/without-kustomize

Opt-out the kustomize feature via go build tags

Author: k8s-ci-robot

pkg/patterns/declarative/kustomize/disabled.go

@@ -0,0 +1,16 @@
+//go:build without_kustomize
+// +build without_kustomize
+
+package kustomize
+
+import (
+	"context"
+	"fmt"
+
+	"sigs.k8s.io/kustomize/kyaml/filesys"
+)
+
+// Run ignore the `kustomization.yaml` file and won't run `kustomize build`.
+func Run(_ context.Context, _ filesys.FileSystem, _ string) ([]byte, error) {
+	return nil, fmt.Errorf("kustomize support is not compiled in (built with tag `without_kustomize`)")
+}

pkg/patterns/declarative/kustomize/enabled.go

@@ -0,0 +1,33 @@
+//go:build !without_kustomize
+// +build !without_kustomize
+
+package kustomize
+
+import (
+	"context"
+	"fmt"
+
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/kustomize/api/krusty"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
+)
+
+// Run calls the kustomize/api library to run `kustomize build`. This method is differentiated by go build
+// tag `without-kustomize`
+func Run(ctx context.Context, fs filesys.FileSystem, manifestPath string) ([]byte, error) {
+	log := log.FromContext(ctx)
+	log.WithValues("manifestPath", manifestPath).Info("running kustomize")
+	// run kustomize to create final manifest
+	opts := krusty.MakeDefaultOptions()
+	kustomizer := krusty.MakeKustomizer(opts)
+	m, err := kustomizer.Run(fs, manifestPath)
+	if err != nil {
+		return nil, fmt.Errorf("error running kustomize: %v", err)
+	}
+
+	manifestYaml, err := m.AsYaml()
+	if err != nil {
+		return nil, fmt.Errorf("error converting kustomize output to yaml: %v", err)
+	}
+	return manifestYaml, nil
+}

pkg/patterns/declarative/reconciler.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/meta"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/kustomize"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
@@ -39,7 +40,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/kustomize/api/krusty"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/applier"
@@ -390,20 +390,12 @@ func (r *Reconciler) BuildDeploymentObjectsWithFs(ctx context.Context, name type
 	// Here, the manifest is built using Kustomize and then replaces the Object items with the created manifest
 	if r.IsKustomizeOptionUsed() {
 		// run kustomize to create final manifest
-		opts := krusty.MakeDefaultOptions()
-		k := krusty.MakeKustomizer(opts)
-		m, err := k.Run(fs, manifestObjects.Path)
+		manifestYaml, err := kustomize.Run(ctx, fs, manifestObjects.Path)
 		if err != nil {
-			log.Error(err, "running kustomize to create final manifest")
+			log.Error(err, "run kustomize build")
 			return nil, fmt.Errorf("error running kustomize: %v", err)
 		}
 
-		manifestYaml, err := m.AsYaml()
-		if err != nil {
-			log.Error(err, "creating final manifest yaml")
-			return nil, fmt.Errorf("error converting kustomize output to yaml: %v", err)
-		}
-
 		objects, err := r.parseManifest(ctx, instance, string(manifestYaml))
 		if err != nil {
 			log.Error(err, "creating final manifest yaml")