reset changes back to master branch for ci test

Author: ChristopherFry

applylib/applyset/applyset.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
-	"strings"
 	"sync"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -71,7 +70,7 @@ type ApplySet struct {
 	// deployment manifests.
 	parent Parent
 	// If not given, the tooling value will be the `Parent` Kind.
-	tooling kubectlapply.ApplySetTooling
+	tooling string
 }
 
 // Options holds the parameters for building an ApplySet.
@@ -94,16 +93,7 @@ type Options struct {
 func New(options Options) (*ApplySet, error) {
 	parent := options.Parent
 	parentRef := &kubectlapply.ApplySetParentRef{Name: parent.Name(), Namespace: parent.Namespace(), RESTMapping: parent.RESTMapping()}
-
-	// The tooling string slash cutting is to support the ApplySetTooling struct that kubectlapply.NewApplySet() expects.
-	// For instance, 'kpt/v1.0.0' will map to ApplySetTooling{Name: "kpt", Version: "v1.0.0"}.
-	toolName, toolVersion, _ := strings.Cut(options.Tooling, "/")
-	if toolName == "" {
-		toolName = parent.GetSubject().GetObjectKind().GroupVersionKind().Kind
-	}
-	tooling := kubectlapply.ApplySetTooling{Name: toolName, Version: toolVersion}
-
-	kapplyset := kubectlapply.NewApplySet(parentRef, tooling, options.RESTMapper)
+	kapplyset := kubectlapply.NewApplySet(parentRef, kubectlapply.ApplySetTooling{Name: options.Tooling}, options.RESTMapper)
 	if options.PatchOptions.FieldManager == "" {
 		options.PatchOptions.FieldManager = kapplyset.FieldManager()
 	}
@@ -115,7 +105,7 @@ func New(options Options) (*ApplySet, error) {
 		deleteOptions: options.DeleteOptions,
 		prune:         options.Prune,
 		parent:        parent,
-		tooling:       tooling,
+		tooling:       options.Tooling,
 	}
 	a.trackers = &objectTrackerList{}
 	return a, nil
@@ -159,7 +149,7 @@ func (a *ApplySet) ApplyOnce(ctx context.Context) (*ApplyResults, error) {
 	// single actuation and not for reconciliation.
 	// Note: The Kubectl ApplySet will share the RESTMapper with k-d-p/ApplySet, which caches all the manifests in the past.
 	parentRef := &kubectlapply.ApplySetParentRef{Name: a.parent.Name(), Namespace: a.parent.Namespace(), RESTMapping: a.parent.RESTMapping()}
-	kapplyset := kubectlapply.NewApplySet(parentRef, a.tooling, a.restMapper)
+	kapplyset := kubectlapply.NewApplySet(parentRef, kubectlapply.ApplySetTooling{Name: a.tooling}, a.restMapper)
 
 	// Cache the current RESTMappings to avoid re-fetching the bad ones.
 	restMappings := make(map[schema.GroupVersionKind]restMappingResult)
@@ -375,7 +365,7 @@ func (a *ApplySet) WithParent(ctx context.Context, kapplyset *kubectlapply.Apply
 		if annotations == nil {
 			annotations = make(map[string]string)
 		}
-		annotations[kubectlapply.ApplySetToolingAnnotation] = a.tooling.String()
+		annotations[kubectlapply.ApplySetToolingAnnotation] = a.tooling
 		if _, ok := annotations[kubectlapply.ApplySetGRsAnnotation]; !ok {
 			annotations[kubectlapply.ApplySetGRsAnnotation] = ""
 		}