feat: avoid importing kubectl deps when using ApplysetApplier

kubernetes-sigs · May 3, 2023 · 2eb6c43 · 2eb6c43
1 parent c3c2bb8
commit 2eb6c43
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/pkg/patterns/declarative/pkg/applier/applylib.go b/pkg/patterns/declarative/pkg/applier/applylib.go
@@ -1,3 +1,6 @@
+//go:build without_kubectl_deps
+// +build without_kubectl_deps
+
 package applier
 
 import (
@@ -13,6 +16,8 @@ import (
 	"sigs.k8s.io/kubebuilder-declarative-pattern/applylib/applyset"
 )
 
+var DefaultApplier = NewApplySetApplier(metav1.PatchOptions{}, metav1.DeleteOptions{}, ApplysetOptions{})
+
 type ApplysetOptions struct {
 	Tooling string
 }

diff --git a/pkg/patterns/declarative/pkg/applier/direct.go b/pkg/patterns/declarative/pkg/applier/direct.go
@@ -1,3 +1,6 @@
+//go:build !without_kubectl_deps
+// +build !without_kubectl_deps
+
 package applier
 
 import (
@@ -6,7 +9,9 @@ import (
 	"os"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubectl/pkg/util/prune"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/applylib/applyset"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -23,6 +28,11 @@ import (
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/manifest"
 )
 
+var DefaultApplier = NewDirectApplier()
+var NewParentRef = func(meta.RESTMapper, runtime.Object, string, string) (applyset.Parent, error) {
+	return nil, nil
+}
+
 type DirectApplier struct {
 	inner directApplierSite
 }

diff --git a/pkg/patterns/declarative/pkg/applier/exec.go b/pkg/patterns/declarative/pkg/applier/exec.go
@@ -1,3 +1,6 @@
+//go:build !without_kubectl_deps
+// +build !without_kubectl_deps
+
 /*
 Copyright 2018 The Kubernetes Authors.
 

diff --git a/pkg/patterns/declarative/reconciler.go b/pkg/patterns/declarative/reconciler.go
@@ -95,7 +95,7 @@ func (e *ErrorResult) Error() string {
 }
 
 // For mocking
-var defaultApplier = applier.NewDirectApplier()
+var defaultApplier = applier.DefaultApplier
 
 func (r *Reconciler) Init(mgr manager.Manager, prototype DeclarativeObject, opts ...ReconcilerOption) error {
 	r.prototype = prototype

diff --git a/pkg/test/testreconciler/simpletest/controller_test.go b/pkg/test/testreconciler/simpletest/controller_test.go
@@ -1,3 +1,6 @@
+//go:build without_kubectl_deps
+// +build without_kubectl_deps
+
 package simpletest
 
 import (