fix: recreate golden testdata

Signed-off-by: Matthew Clarke <[email protected]>

Author: mclarke47

pkg/test/testreconciler/simpletest/controller.go

@@ -18,6 +18,7 @@ package simpletest
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -44,6 +45,7 @@ type SimpleTestReconciler struct {
 	client.Client
 	Log    logr.Logger
 	Scheme *runtime.Scheme
+	TestSuffix   string
 
 	watchLabels declarative.LabelMaker
 
@@ -89,7 +91,7 @@ func (r *SimpleTestReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return err
 	}
 
-	c, err := controller.New("simpletest-controller", mgr, controller.Options{Reconciler: r})
+	c, err := controller.New(fmt.Sprintf("simpletest-controller-%s", r.TestSuffix), mgr, controller.Options{Reconciler: r})
 	if err != nil {
 		return err
 	}

pkg/test/testreconciler/simpletest/controller_test.go

@@ -87,6 +87,7 @@ func testSimpleReconciler(h *testharness.Harness, testdir string, applier applie
 	}
 
 	reconciler := &SimpleTestReconciler{
+		TestSuffix: testdir,
 		Client:  mgr.GetClient(),
 		Scheme:  mgr.GetScheme(),
 		applier: applier,

pkg/test/testreconciler/simpletest/testdata/reconcile/ssa/create/expected-http.yaml

@@ -245,7 +245,7 @@ Date: (removed)
 ---
 
 GET http://kube-apiserver/api
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 
 
 200 OK
@@ -259,7 +259,7 @@ Date: (removed)
 ---
 
 GET http://kube-apiserver/apis
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 
 
 200 OK