Add support for v1.Node

Author: pepov

README.md

@@ -26,6 +26,7 @@ Here at Banzai Cloud we love and write lots of Kubernetes [operators](https://gi
 - ServiceAccount
 - PodDisruptionBudget
 - Unstructured
+- Node
 
 ### How to use it
 

integration_test.go

@@ -481,6 +481,26 @@ func TestIntegration(t *testing.T) {
 			Version:  "v1",
 			Resource: "serviceaccounts",
 		}),
+		NewTestMatch("node match",
+			&v1.Node{
+				ObjectMeta: standardObjectMeta(),
+				Spec: v1.NodeSpec{
+					PodCIDR: "10.0.0.0/24",
+				},
+				// ignore due to already removed field
+			}).withIgnoreVersions([]string{"v1.10"}),
+		NewTestDiff("node diff for podcidr",
+			&v1.Node{
+				ObjectMeta: standardObjectMeta(),
+				Spec: v1.NodeSpec{
+					PodCIDR: "10.0.0.0/24",
+				},
+			}).
+			withLocalChange(func(i interface{}) {
+				n := i.(*v1.Node)
+				n.Spec.PodCIDR = "10.0.0.1/24"
+				// ignore due to already removed field
+			}).withIgnoreVersions([]string{"v1.10"}),
 	}
 	for _, test := range tests {
 		serverVersion := os.Getenv("K8S_VERSION")
@@ -502,7 +522,11 @@ func TestIntegration(t *testing.T) {
 		}
 		err := testMatchOnObject(test)
 		if err != nil {
-			t.Errorf("Test '%s' failed: %s %s", test.name, err, emperror.Context(err))
+			if *failonerror {
+				t.Fatalf("Test '%s' failed: %s %s", test.name, err, emperror.Context(err))
+			} else {
+				t.Errorf("Test '%s' failed: %s %s", test.name, err, emperror.Context(err))
+			}
 		}
 	}
 }

main_test.go

@@ -48,6 +48,7 @@ var (
 	kubeconfig    = flag.String("kubeconfig", filepath.Join(homedir.HomeDir(), ".kube/config"), "kubernetes config to use for tests")
 	kubecontext   = flag.String("kubecontext", "", "kubernetes context to use in tests")
 	keepnamespace = flag.Bool("keepnamespace", false, "keep the kubernetes namespace that was used for the tests")
+	failonerror   = flag.Bool("failonerror", false, "fail on error to be able to debug invalid state")
 	testContext   = &IntegrationTestContext{}
 )
 
@@ -368,6 +369,17 @@ func testMatchOnObject(testItem *TestItem) error {
 				log.Printf("Failed to remove object %s", existing.GetName())
 			}
 		}()
+	case *v1.Node:
+		existing, err = testContext.Client.CoreV1().Nodes().Create(newObject.(*v1.Node))
+		if err != nil {
+			return emperror.WrapWith(err, "failed to create object", "object", newObject)
+		}
+		defer func() {
+			err = testContext.Client.CoreV1().Nodes().Delete(existing.GetName(), deleteOptions)
+			if err != nil {
+				log.Printf("Failed to remove object %s", existing.GetName())
+			}
+		}()
 	}
 
 	if testItem.remoteChange != nil {

node.go

@@ -0,0 +1,71 @@
+// Copyright © 2019 Banzai Cloud
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package objectmatch
+
+import (
+	"encoding/json"
+
+	"github.com/goph/emperror"
+	v1 "k8s.io/api/core/v1"
+	kubernetescorev1 "k8s.io/kubernetes/pkg/apis/core/v1"
+)
+
+type nodeMatcher struct {
+	objectMatcher ObjectMatcher
+}
+
+func NewNodeMatcher(objectMatcher ObjectMatcher) *nodeMatcher {
+	return &nodeMatcher{
+		objectMatcher: objectMatcher,
+	}
+}
+
+func (m nodeMatcher) Match(oldOrig, newOrig *v1.Node) (bool, error) {
+
+	old := oldOrig.DeepCopy()
+	new := newOrig.DeepCopy()
+
+	kubernetescorev1.SetObjectDefaults_Node(new)
+
+	type Node struct {
+		ObjectMeta
+		Spec v1.NodeSpec
+	}
+
+	oldData, err := json.Marshal(Node{
+		ObjectMeta: m.objectMatcher.GetObjectMeta(old.ObjectMeta),
+		Spec:       old.Spec,
+	})
+	if err != nil {
+		return false, emperror.WrapWith(err, "could not marshal old object", "name", old.Name)
+	}
+
+	newObject := Node{
+		ObjectMeta: m.objectMatcher.GetObjectMeta(new.ObjectMeta),
+		Spec:       new.Spec,
+	}
+
+	newData, err := json.Marshal(newObject)
+	if err != nil {
+		return false, emperror.WrapWith(err, "could not marshal new object", "name", new.Name)
+	}
+
+	matched, err := m.objectMatcher.MatchJSON(oldData, newData, newObject)
+	if err != nil {
+		return false, emperror.WrapWith(err, "could not match objects", "name", new.Name)
+	}
+
+	return matched, nil
+}

objectmatch.go

@@ -218,6 +218,16 @@ func (om *objectMatcher) Match(old, new interface{}) (bool, error) {
 			return false, errors.WithStack(err)
 		}
 		return ok, nil
+	case *corev1.Node:
+		oldObject := old.(*corev1.Node)
+		newObject := new.(*corev1.Node)
+
+		m := NewNodeMatcher(om)
+		ok, err := m.Match(oldObject, newObject)
+		if err != nil {
+			return false, errors.WithStack(err)
+		}
+		return ok, nil
 	}
 }