Merge branch 'prototype-dev-v2' of https://github.com/Azure/eno into …

…prototype-dev-v2
Azure · Dec 1, 2023 · 491b1e5 · 491b1e5
2 parents 49ad7a2 + 2222b09
commit 491b1e5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 56 deletions.
diff --git a/cmd/eno-reconciler/main.go b/cmd/eno-reconciler/main.go
@@ -79,7 +79,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	if err := reconciliation.New(reMgr, nil, 1, true); err != nil { // TODO
+	if _, err := reconciliation.New(reMgr, nil, 1, true); err != nil { // TODO
 		return err
 	}
 

diff --git a/internal/controllers/reconciliation/controller.go b/internal/controllers/reconciliation/controller.go
@@ -29,7 +29,7 @@ type Controller struct {
 	discovery      *discoveryCache
 }
 
-func New(mgr *reconstitution.Manager, downstream *rest.Config, discoveryRPS float32, rediscoverWhenNotFound bool) (*Controller, error) {
+func New(mgr *reconstitution.Manager, downstream *rest.Config, discoveryRPS float32, rediscoverWhenNotFound bool) (*Controller, error) { // TODO: REmove return
 	upstreamClient, err := client.New(downstream, client.Options{
 		Scheme: runtime.NewScheme(), // empty scheme since we shouldn't rely on compile-time types
 	})

diff --git a/internal/controllers/reconciliation/controller_test.go b/internal/controllers/reconciliation/controller_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/util/retry"
@@ -22,61 +21,8 @@ import (
 	"github.com/Azure/eno/internal/testutil"
 )
 
-// https://github.com/kubernetes/kubectl/blob/eb3138bd9f8c0a4ec3dece5d431ba21be9c0bcf1/pkg/cmd/apply/patcher.go#L187
-
 // TODO: Add CR test
 
-func TestTEMP(t *testing.T) { // TODO
-	ctx := testutil.NewContext(t)
-	mgr := testutil.NewManager(t)
-
-	// Register supporting controllers
-	rm, err := reconstitution.New(mgr.Manager, time.Millisecond)
-	require.NoError(t, err)
-
-	c, err := New(rm, mgr.DownstreamRestConfig, 5, testutil.AtLeastVersion(t, 15))
-	require.NoError(t, err)
-	mgr.Start(t)
-
-	svc := &corev1.Service{}
-	svc.Name = "test-service"
-	svc.Namespace = "default"
-	svc.APIVersion = "v1"
-	svc.Kind = "Service"
-	svc.Spec.Ports = []corev1.ServicePort{{
-		Name: "foo",
-		Port: 123,
-	}}
-	require.NoError(t, mgr.DownstreamClient.Create(ctx, svc))
-	prevMani, _ := json.Marshal(svc)
-	svc.APIVersion = "v1" // ?
-	svc.Kind = "Service"
-
-	copy := svc.DeepCopy()
-	copy.Spec.Ports = append(copy.Spec.Ports, corev1.ServicePort{
-		Name: "external",
-		Port: 234,
-	})
-	require.NoError(t, mgr.DownstreamClient.Update(ctx, copy))
-	currentMani, _ := json.Marshal(copy)
-
-	svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
-		Name: "bar",
-		Port: 234,
-	})
-	nextMani, _ := json.Marshal(svc)
-
-	prev := &reconstitution.Resource{Manifest: string(prevMani)}
-	next := &reconstitution.Resource{Manifest: string(nextMani)}
-	current := &unstructured.Unstructured{Object: map[string]interface{}{}}
-	require.NoError(t, current.UnmarshalJSON([]byte(currentMani)))
-
-	patch, _, err := c.buildPatch(ctx, prev, next, current)
-	require.NoError(t, err)
-
-	t.Errorf("PATCH: %s", patch)
-}
-
 func TestControllerBasics(t *testing.T) {
 	tests := []struct {
 		Name                         string