Skip to content

Commit f1c5590

Browse files
author
Per Goncalves da Silva
committed
Fix crd-generator tests
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent 1e51555 commit f1c5590

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

hack/tools/crd-generator/main_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"github.com/stretchr/testify/require"
1111
)
1212

13+
const controllerToolsVersion = "v0.19.0"
14+
1315
func TestRunGenerator(t *testing.T) {
1416
here, err := os.Getwd()
1517
require.NoError(t, err)
@@ -24,7 +26,7 @@ func TestRunGenerator(t *testing.T) {
2426
defer os.RemoveAll(dir)
2527
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
2628
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
27-
runGenerator(dir, "v0.18.0")
29+
runGenerator(dir, controllerToolsVersion)
2830

2931
f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
3032
f2 := "config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
@@ -60,7 +62,7 @@ func TestTags(t *testing.T) {
6062
defer os.RemoveAll(dir)
6163
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
6264
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
63-
runGenerator(dir, "v0.18.0", "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
65+
runGenerator(dir, controllerToolsVersion, "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
6466

6567
f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
6668
f2 := "output/standard/olm.operatorframework.io_clusterextensions.yaml"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
olm.operatorframework.io/generator: experimental
88
name: clusterextensions.olm.operatorframework.io
99
spec:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
olm.operatorframework.io/generator: standard
88
name: clusterextensions.olm.operatorframework.io
99
spec:

0 commit comments

Comments
 (0)