[kjobctl] Install CRDs on integration tests.

cmd/experimental/kjobctl/apis/v1alpha1/volumebundle_types.go

@@ -22,7 +22,6 @@ import (
 )
 
 // VolumeBundleSpec defines the desired state of VolumeBundle
-// +kubebuilder:validation:XValidation:rule="self.mountPoints.map(x, x.name in self.volumes.map(y, y.name))", message="mountPoint name must match a volume name"
 type VolumeBundleSpec struct {
 	// volumes is a set of volumes that will be added to all pods of the job.
 	// +listType=map
@@ -39,7 +38,8 @@ type VolumeBundleSpec struct {
 	// envVars are environment variables that refer to absolute paths in the container filesystem.
 	// These key/value pairs will be available in containers as environment variables.
 	// +optional
-	// +kubebuilder:validation:XValidation:rule="self.all(x, x.name.matches('^[A-Za-z_][A-Za-z0-9_]*$') )", message="invalid environment variable name"
+	// +listType=map
+	// +listMapKey=name
 	EnvVars []corev1.EnvVar `json:"envVars,omitempty"`
 }
 

cmd/experimental/kjobctl/config/crd/bases/kjobctl.x-k8s.io_volumebundles.yaml

@@ -236,9 +236,9 @@ spec:
                   - name
                   type: object
                 type: array
-                x-kubernetes-validations:
-                - message: invalid environment variable name
-                  rule: self.all(x, x.name.matches('^[A-Za-z_][A-Za-z0-9_]*$') )
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               volumes:
                 description: volumes is a set of volumes that will be added to all
                   pods of the job.
@@ -2004,9 +2004,6 @@ spec:
             - containerVolumeMounts
             - volumes
             type: object
-            x-kubernetes-validations:
-            - message: mountPoint name must match a volume name
-              rule: self.mountPoints.map(x, x.name in self.volumes.map(y, y.name))
         type: object
     served: true
     storage: true

cmd/experimental/kjobctl/test/framework/framework.go

@@ -28,14 +28,18 @@ import (
 )
 
 type Framework struct {
+	CRDPath string
 	testEnv *envtest.Environment
 	cancel  context.CancelFunc
 }
 
 func (f *Framework) Init() *rest.Config {
 	ginkgo.By("bootstrapping test environment")
 
-	f.testEnv = &envtest.Environment{}
+	f.testEnv = &envtest.Environment{
+		CRDDirectoryPaths:     []string{f.CRDPath},
+		ErrorIfCRDPathMissing: true,
+	}
 	cfg, err := f.testEnv.Start()
 
 	gomega.ExpectWithOffset(1, err).NotTo(gomega.HaveOccurred())

cmd/experimental/kjobctl/test/integration/kjobctl/suite_test.go

@@ -18,6 +18,7 @@ package kjobctl
 
 import (
 	"context"
+	"path/filepath"
 	"testing"
 
 	"github.com/onsi/ginkgo/v2"
@@ -33,6 +34,7 @@ var (
 	k8sClient client.Client
 	ctx       context.Context
 	fwk       *framework.Framework
+	crdPath   = filepath.Join("..", "..", "..", "config", "crd", "bases")
 )
 
 func TestKjobctl(t *testing.T) {
@@ -41,7 +43,7 @@ func TestKjobctl(t *testing.T) {
 }
 
 var _ = ginkgo.BeforeSuite(func() {
-	fwk = &framework.Framework{}
+	fwk = &framework.Framework{CRDPath: crdPath}
 	cfg = fwk.Init()
 	ctx, k8sClient = fwk.SetupClient(cfg)
 })