Fix up crd-generator unit tests

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

hack/tools/crd-generator/README.md

@@ -50,4 +50,4 @@ the experimental CRD when feature gates are enabled.
 * End Tag: `</opcon:util:excludeFromCRD>`
 
 Descriptive text that is excluded from the CRD description. This is similar to the use of `---`, except
-the three hypens excludes *all* following text.
+the three hyphens excludes *all* following text.

hack/tools/crd-generator/main_test.go

@@ -7,9 +7,14 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 )
 
+const (
+	controllerToolsVersion = "v0.19.0"
+)
+
 func TestRunGenerator(t *testing.T) {
 	here, err := os.Getwd()
 	require.NoError(t, err)
@@ -24,7 +29,7 @@ func TestRunGenerator(t *testing.T) {
 	defer os.RemoveAll(dir)
 	require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
 	require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
-	runGenerator(dir, "v0.18.0")
+	runGenerator(dir, "v0.19.0")
 
 	f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
 	f2 := "config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
@@ -60,7 +65,7 @@ func TestTags(t *testing.T) {
 	defer os.RemoveAll(dir)
 	require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
 	require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
-	runGenerator(dir, "v0.18.0", "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
+	runGenerator(dir, controllerToolsVersion, "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
 
 	f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
 	f2 := "output/standard/olm.operatorframework.io_clusterextensions.yaml"
@@ -98,6 +103,10 @@ func compareFiles(t *testing.T, file1, file2 string) {
 		}
 		require.NoError(t, err1)
 		require.NoError(t, err2)
+		diff := cmp.Diff(string(b1), string(b2))
+		if diff != "" {
+			t.Errorf("unexpected channel diff (-expected +received):\n%s", diff)
+		}
 		require.Equal(t, n1, n2)
 		require.Equal(t, b1, b2)
 	}

hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     olm.operatorframework.io/generator: experimental
   name: clusterextensions.olm.operatorframework.io
 spec:

hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     olm.operatorframework.io/generator: standard
   name: clusterextensions.olm.operatorframework.io
 spec: