Skip to content

Commit 6133adf

Browse files
committed
move crds into helm chart
1 parent 8c57466 commit 6133adf

File tree

12 files changed

+20
-19
lines changed

12 files changed

+20
-19
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ gen-license: addlicense
5858

5959
.PHONY: manifests
6060
manifests: controller-gen kustomize ## Generate ClusterRole and CustomResourceDefinition objects.
61-
$(CONTROLLER_GEN) crd:allowDangerousTypes=true,generateEmbeddedObjectMeta=true,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/apis/..." output:crd:artifacts:config=deployments/crds/internal
61+
$(CONTROLLER_GEN) crd:allowDangerousTypes=true,generateEmbeddedObjectMeta=true,headerFile="./hack/boilerplate.yaml.txt" paths="./pkg/apis/..." output:crd:artifacts:config=deployments/kai-scheduler/crds/internal
6262
$(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
6363
$(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
6464
$(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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SUCCESS_MESSAGE_HANDLER=(${ECHO_COMMAND} ${GREEN_CONSOLE} "${CONSOLE_PREFIX} Suc
99

1010
DOCKER_SOCK_PATH=/var/run/docker.sock
1111
DOCKERFILE_PATH=./Dockerfile
12-
CRD_UPGRADER_DOCKERFILE_PATH=./deployments/crds/crd-upgrader/Dockerfile
12+
CRD_UPGRADER_DOCKERFILE_PATH=./deployments/kai-scheduler/crds/crd-upgrader/Dockerfile
1313

1414
DOCKER_TAG?=0.0.0
1515
VERSION?=${DOCKER_TAG}
@@ -59,4 +59,4 @@ docker-build-crd-upgrader:
5959

6060
docker-build-generic:
6161
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} .
62-
.PHONY: docker-build-generic
62+
.PHONY: docker-build-generic

deployments/crds/crd-upgrader/Dockerfile renamed to deployments/kai-scheduler/crds/crd-upgrader/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ RUN curl -o kubectl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io
88
&& chmod +x kubectl && mv kubectl /usr/bin/kubectl
99

1010

11-
COPY deployments/crds/internal /internal-crds
12-
COPY deployments/crds/external /external-crds
11+
COPY deployments/kai-scheduler/crds/internal /internal-crds
12+
COPY deployments/kai-scheduler/crds/external /external-crds
1313
COPY NOTICE .
14-
COPY deployments/crds/crd-upgrader/apply-crds.sh /apply-crds.sh
14+
COPY deployments/kai-scheduler/crds/crd-upgrader/apply-crds.sh /apply-crds.sh
1515
RUN chmod +x /apply-crds.sh
1616

1717
USER 65532:65532
1818

19-
CMD ["/apply-crds.sh"]
19+
CMD ["/apply-crds.sh"]

pkg/binder/controllers/integration_tests/suite_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ var _ = BeforeSuite(func() {
6767

6868
By("bootstrapping test environment")
6969
testEnv = &envtest.Environment{
70-
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "deployments", "crds", "internal")},
70+
CRDDirectoryPaths: []string{
71+
filepath.Join("..", "..", "..", "..", "deployments", "kai-scheduler", "crds", "internal"),
72+
filepath.Join("..", "..", "..", "..", "deployments", "kai-scheduler", "crds", "external"),
73+
},
7174
ErrorIfCRDPathMissing: true,
7275
}
7376

74-
// Add the kueue crd to the test environment
75-
testEnv.CRDDirectoryPaths = append(testEnv.CRDDirectoryPaths, filepath.Join("..", "..", "..", "..", "deployments", "crds", "external"))
76-
7777
var err error
7878
// cfg is defined in this file globally.
7979
cfg, err = testEnv.Start()

pkg/env-tests/env_tests_suite_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ var _ = BeforeSuite(func(ctx context.Context) {
4646

4747
By("bootstrapping test environment")
4848
testEnv = &envtest.Environment{
49-
CRDDirectoryPaths: []string{filepath.Join("..", "..", "deployments", "crds", "internal")},
49+
CRDDirectoryPaths: []string{
50+
filepath.Join("..", "..", "deployments", "kai-scheduler", "crds", "internal"),
51+
filepath.Join("..", "..", "deployments", "kai-scheduler", "crds", "external"),
52+
},
5053
ErrorIfCRDPathMissing: true,
5154
}
5255

53-
// Add the kueue crd to the test environment
54-
testEnv.CRDDirectoryPaths = append(testEnv.CRDDirectoryPaths, filepath.Join("..", "..", "deployments", "crds", "external"))
5556
testEnv.ControlPlane.GetAPIServer().Configure().Append("feature-gates", "DynamicResourceAllocation=true")
5657
testEnv.ControlPlane.GetAPIServer().Configure().Append("runtime-config", "api/all=true")
5758
featuregate.SetFeatureGateDuringTest(tt, utilfeature.DefaultFeatureGate,

0 commit comments

Comments
 (0)