move crds into helm chart

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+### Changed
+- Moved the CRDs into the helm chart so that they are also installed by helm and not only by the crd-upgrader, but removed the external kueue clone of topology CRD from being automatically installed.
+
 ### Fixed
 - Fixed a bug where workload with subgroups would not consider additional tasks above minAvailable
 

Makefile

@@ -58,7 +58,7 @@ gen-license: addlicense
 
 .PHONY: manifests
 manifests: controller-gen kustomize ## Generate ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) crd:allowDangerousTypes=true,generateEmbeddedObjectMeta=true,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/apis/..." output:crd:artifacts:config=deployments/crds/internal
+	$(CONTROLLER_GEN) crd:allowDangerousTypes=true,generateEmbeddedObjectMeta=true,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/apis/..." output:crd:artifacts:config=deployments/kai-scheduler/crds/internal
 	$(CONTROLLER_GEN) rbac:roleName=kai-podgrouper,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/podgrouper/..." paths="./cmd/podgrouper/..." output:stdout > deployments/kai-scheduler/templates/rbac/podgrouper.yaml
 	$(CONTROLLER_GEN) rbac:roleName=kai-binder,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/binder/..." paths="./cmd/binder/..." output:stdout > deployments/kai-scheduler/templates/rbac/binder.yaml
 	$(CONTROLLER_GEN) rbac:roleName=kai-resource-reservation,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/resourcereservation/..." paths="./cmd/resourcereservation/..." output:stdout > deployments/kai-scheduler/templates/rbac/resourcereservation.yaml

build/makefile/base.mk

@@ -9,7 +9,7 @@ SUCCESS_MESSAGE_HANDLER=(${ECHO_COMMAND} ${GREEN_CONSOLE} "${CONSOLE_PREFIX} Suc
 
 DOCKER_SOCK_PATH=/var/run/docker.sock
 DOCKERFILE_PATH=./Dockerfile
-CRD_UPGRADER_DOCKERFILE_PATH=./deployments/crds/crd-upgrader/Dockerfile
+CRD_UPGRADER_DOCKERFILE_PATH=./deployments/crd-upgrader/Dockerfile
 
 DOCKER_TAG?=0.0.0
 VERSION?=${DOCKER_TAG}
@@ -59,4 +59,4 @@ docker-build-crd-upgrader:
 
 docker-build-generic:
 	DOCKER_BUILDKIT=1 docker buildx build ${DOCKER_BUILD_ADDITIONAL_ARGS} --build-arg SERVICE_NAME=${SERVICE_NAME} -f ${DOCKERFILE_PATH} -t ${DOCKER_IMAGE_NAME} ${DOCKER_BUILDX_ADDITIONAL_ARGS} --platform ${DOCKER_BUILD_PLATFORM} .
-.PHONY: docker-build-generic
+.PHONY: docker-build-generic

deployments/crds/crd-upgrader/Dockerfile → deployments/crd-upgrader/Dockerfile

@@ -8,12 +8,12 @@ RUN curl -o kubectl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io
 && chmod +x kubectl && mv kubectl /usr/bin/kubectl
 
 
-COPY deployments/crds/internal /internal-crds
-COPY deployments/crds/external /external-crds
+COPY deployments/kai-scheduler/crds /internal-crds
+COPY deployments/external-crds /external-crds
 COPY NOTICE .
-COPY deployments/crds/crd-upgrader/apply-crds.sh /apply-crds.sh
+COPY deployments/crd-upgrader/apply-crds.sh /apply-crds.sh
 RUN chmod +x /apply-crds.sh
 
 USER 65532:65532
 
-CMD ["/apply-crds.sh"]
+CMD ["/apply-crds.sh"]

pkg/binder/controllers/integration_tests/suite_test.go

@@ -66,8 +66,8 @@ var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "..", "..", "..", "deployments", "crds", "internal"),
-			filepath.Join("..", "..", "..", "..", "deployments", "crds", "external"),
+			filepath.Join("..", "..", "..", "..", "deployments", "kai-scheduler", "crds"),
+			filepath.Join("..", "..", "..", "..", "deployments", "external-crds"),
 		},
 		ErrorIfCRDPathMissing: true,
 	}

pkg/env-tests/env_tests_suite_test.go

@@ -46,12 +46,13 @@ var _ = BeforeSuite(func(ctx context.Context) {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "deployments", "crds", "internal")},
+		CRDDirectoryPaths: []string{
+			filepath.Join("..", "..", "deployments", "kai-scheduler", "crds"),
+			filepath.Join("..", "..", "deployments", "external-crds"),
+		},
 		ErrorIfCRDPathMissing: true,
 	}
 
-	// Add the kueue crd to the test environment
-	testEnv.CRDDirectoryPaths = append(testEnv.CRDDirectoryPaths, filepath.Join("..", "..", "deployments", "crds", "external"))
 	testEnv.ControlPlane.GetAPIServer().Configure().Append("feature-gates", "DynamicResourceAllocation=true")
 	testEnv.ControlPlane.GetAPIServer().Configure().Append("runtime-config", "api/all=true")
 	featuregate.SetFeatureGateDuringTest(tt, utilfeature.DefaultFeatureGate,

pkg/podgrouper/suite_test.go

@@ -36,7 +36,9 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "deployments", "crds", "internal")},
+		CRDDirectoryPaths: []string{
+			filepath.Join("..", "..", "deployments", "kai-scheduler", "crds"),
+		},
 		ErrorIfCRDPathMissing: true,
 	}
 

pkg/queuecontroller/controllers/suite_test.go

@@ -71,13 +71,13 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "deployments", "crds", "internal")},
+		CRDDirectoryPaths: []string{
+			filepath.Join("..", "..", "..", "deployments", "kai-scheduler", "crds"),
+			filepath.Join("..", "..", "..", "deployments", "external-crds"),
+		},
 		ErrorIfCRDPathMissing: true,
 	}
 
-	// Add the kueue crd to the test environment
-	testEnv.CRDDirectoryPaths = append(testEnv.CRDDirectoryPaths, filepath.Join("..", "..", "..", "deployments", "crds", "external"))
-
 	var err error
 	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())