Migrate to server-side applies by default

Author: pst

.gitignore

@@ -4,3 +4,4 @@ terraform.d
 crash.log
 dist/
 kustomize/test_kustomizations/helm/remote/
+.vscode/

kustomize/manifest.go

@@ -13,11 +13,11 @@ import (
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	k8smeta "k8s.io/apimachinery/pkg/api/meta"
 	k8smetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	k8sunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	k8sschema "k8s.io/apimachinery/pkg/runtime/schema"
 	k8stypes "k8s.io/apimachinery/pkg/types"
+	k8smetav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
 	k8sdynamic "k8s.io/client-go/dynamic"
 	"k8s.io/client-go/restmapper"
 )
@@ -85,16 +85,18 @@ func emptyToUnderscore(value string) string {
 }
 
 type kManifest struct {
-	resource *k8sunstructured.Unstructured
-	mapper   *restmapper.DeferredDiscoveryRESTMapper
-	client   k8sdynamic.Interface
-	json     []byte
+	resource  *k8sunstructured.Unstructured
+	mapper    *restmapper.DeferredDiscoveryRESTMapper
+	extractor k8smetav1ac.UnstructuredExtractor
+	client    k8sdynamic.Interface
+	json      []byte
 }
 
-func newKManifest(mapper *restmapper.DeferredDiscoveryRESTMapper, client k8sdynamic.Interface) *kManifest {
+func newKManifest(m *restmapper.DeferredDiscoveryRESTMapper, c k8sdynamic.Interface, e k8smetav1ac.UnstructuredExtractor) *kManifest {
 	return &kManifest{
-		mapper: mapper,
-		client: client,
+		mapper:    m,
+		client:    c,
+		extractor: e,
 	}
 }
 
@@ -204,6 +206,15 @@ func (km *kManifest) apiDelete(opts k8smetav1.DeleteOptions) (err error) {
 	return api.Delete(context.TODO(), km.name(), opts)
 }
 
+func (km *kManifest) apiApply(opts k8smetav1.ApplyOptions) (resp *k8sunstructured.Unstructured, err error) {
+	api, err := km.api()
+	if err != nil {
+		return resp, km.fmtErr(fmt.Errorf("create failed: %s", err))
+	}
+
+	return api.Apply(context.TODO(), km.name(), km.resource, opts)
+}
+
 func (km *kManifest) apiPreparePatch(kmo *kManifest, currAllowNotFound bool) (pt k8stypes.PatchType, p []byte, err error) {
 	original := kmo.json
 	modified := km.json
@@ -253,7 +264,7 @@ func (km *kManifest) getNamespaceManifest() (kns *kManifest, namespaced bool) {
 		return kns, false
 	}
 
-	kns = newKManifest(km.mapper, km.client)
+	kns = newKManifest(km.mapper, km.client, km.extractor)
 
 	kns.resource = kns.resource.NewEmptyInstance().(*k8sunstructured.Unstructured)
 

kustomize/provider.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
+	metav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/discovery/cached/memory"
 	"k8s.io/client-go/dynamic"
@@ -22,8 +23,11 @@ import (
 type Config struct {
 	Client                dynamic.Interface
 	Mapper                *restmapper.DeferredDiscoveryRESTMapper
+	Extractor             metav1ac.UnstructuredExtractor
 	Mutex                 *sync.Mutex
 	GzipLastAppliedConfig bool
+	ServerSideApply       bool
+	ServerSideApplyForce  bool
 }
 
 // Provider ...
@@ -75,6 +79,18 @@ func Provider() *schema.Provider {
 				Default:     true,
 				Description: "When 'true' compress the lastAppliedConfig annotation for resources that otherwise would exceed K8s' max annotation size. All other resources use the regular uncompressed annotation. Set to 'false' to disable compression entirely.",
 			},
+			"server_side_apply": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "When 'true' use server-side apply.",
+			},
+			"server_side_apply_force": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "When 'true' the server-side apply will overwrite any managed fields that another owner has claimed.",
+			},
 		},
 	}
 
@@ -134,16 +150,33 @@ func Provider() *schema.Provider {
 			return nil, fmt.Errorf("provider kustomization: %s", err)
 		}
 
-		mapper := restmapper.NewDeferredDiscoveryRESTMapper(memory.NewMemCacheClient(dc))
+		cDc := memory.NewMemCacheClient(dc)
+
+		mapper := restmapper.NewDeferredDiscoveryRESTMapper(cDc)
+
+		extractor, err := metav1ac.NewUnstructuredExtractor(cDc)
+		if err != nil {
+			return nil, fmt.Errorf("provider kustomization: %s", err)
+		}
 
 		// Mutex to prevent parallel Kustomizer runs
 		// temp workaround for upstream bug
 		// https://github.com/kubernetes-sigs/kustomize/issues/3659
 		mu := &sync.Mutex{}
 
 		gzipLastAppliedConfig := d.Get("gzip_last_applied_config").(bool)
-
-		return &Config{client, mapper, mu, gzipLastAppliedConfig}, nil
+		serverSideApply := d.Get("server_side_apply").(bool)
+		serverSideApplyForce := d.Get("server_side_apply_force").(bool)
+
+		return &Config{
+			Client:                client,
+			Mapper:                mapper,
+			Extractor:             extractor,
+			Mutex:                 mu,
+			GzipLastAppliedConfig: gzipLastAppliedConfig,
+			ServerSideApply:       serverSideApply,
+			ServerSideApplyForce:  serverSideApplyForce,
+		}, nil
 	}
 
 	return p