upgrade kind version of e2e and add the document of things to do when volcano adapts to k8s version upgrade #3404
Conversation
Signed-off-by: guoqinwill <guoqinwill@163.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
volcano-sh-bot
added
the
size/XXL
guoqinwill
force-pushed
the
updatek8s_todo
branch
from
a29ce39
to
bfe26d5
Compare
Signed-off-by: guoqinwill <guoqinwill@163.com>
guoqinwill
force-pushed
the
updatek8s_todo
branch
from
bfe26d5
to
4cabf0c
Compare
| @@ -108,10 +108,6 @@ manifests: controller-gen | |||
| $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/volcano.sh/apis/pkg/apis/scheduling/v1beta1;./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/bus/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/nodeinfo/v1alpha1" output:crd:artifacts:config=config/crd/volcano/bases | |||
| # generate volcano job crd yaml without description to avoid yaml size limit when using `kubectl apply` | |||
| $(CONTROLLER_GEN) $(CRD_OPTIONS_EXCLUDE_DESCRIPTION) paths="./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1" output:crd:artifacts:config=config/crd/volcano/bases | |||
| # volcano crd v1beta1 | |||
| $(CONTROLLER_GEN) "crd:crdVersions=v1beta1" paths="./vendor/volcano.sh/apis/pkg/apis/scheduling/v1beta1;./vendor/volcano.sh/apis/pkg/apis/batch/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/bus/v1alpha1;./vendor/volcano.sh/apis/pkg/apis/nodeinfo/v1alpha1" output:crd:artifacts:config=config/crd/volcano/v1beta1 | |||
There was a problem hiding this comment.
After updating the controller-gen tool to version 0.14.0 (which is compatible with Kubernetes 1.29), generating v1beta1 CRDs is no longer supported. While existing v1beta1 CRDs can still be used, they will not receive further updates.
guoqinwill
force-pushed
the
updatek8s_todo
branch
3 times, most recently
from
37945fe
to
06899e5
Compare
docs/design/adapt-k8s-todo.md
Outdated
| ## TODO things for upgrade | ||
|
|
||
| #### Upgrade volcano apis | ||
| First,we need to upgrade the k8s version of volcano apis, such as:https://github.com/volcano-sh/apis/pull/124. |
There was a problem hiding this comment.
Here should list what we need to do when update apis repo.
And also add to add that go version in go mod file and go build version of dockerfile should keep consistent with k8s.
| tail -n +3 ${VOLCANO_CRD_DIR}/v1beta1/scheduling.volcano.sh_podgroups.yaml > ${HELM_VOLCANO_CRD_DIR}/v1beta1/scheduling.volcano.sh_podgroups.yaml | ||
| tail -n +3 ${VOLCANO_CRD_DIR}/v1beta1/scheduling.volcano.sh_queues.yaml > ${HELM_VOLCANO_CRD_DIR}/v1beta1/scheduling.volcano.sh_queues.yaml | ||
| tail -n +3 ${VOLCANO_CRD_DIR}/v1beta1/nodeinfo.volcano.sh_numatopologies.yaml > ${HELM_VOLCANO_CRD_DIR}/v1beta1/nodeinfo.volcano.sh_numatopologies.yaml | ||
| tail -n +2 ${VOLCANO_CRD_DIR}/bases/batch.volcano.sh_jobs.yaml > ${HELM_VOLCANO_CRD_DIR}/bases/batch.volcano.sh_jobs.yaml |
There was a problem hiding this comment.
The YAML generated by controller-gen v0.14.0 only has empty lines in the first two lines. Removing the first two lines should be sufficient. In previous versions, it was necessary to remove the first three empty lines.
guoqinwill
force-pushed
the
updatek8s_todo
branch
from
06899e5
to
301635a
Compare
…version Signed-off-by: guoqinwill <guoqinwill@163.com>
guoqinwill
force-pushed
the
updatek8s_todo
branch
from
301635a
to
48d6dce
Compare
1、Upgrade the version of kind and controller-gen to adapt k8s version upgrade.
2、Added documentation on what must be done to adapt volcano to the k8s version upgrade.