Skip to content

Commit

Permalink
Merge pull request #3767 from vie-serendipity/feat/adapt-1.31
Browse files Browse the repository at this point in the history 
feat: Volcano Supports K8s v1.31
  • Loading branch information
@volcano-sh-bot
volcano-sh-bot authored Oct 23, 2024
2 parents 2c3ab7b + efc379c commit 1ab6088
Show file tree
Hide file tree
Showing 45 changed files with 1,880 additions and 845 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e_parallel_jobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.23.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.30.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
GO111MODULE="on" go install sigs.k8s.io/kind@v0.24.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_scheduling_actions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.23.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.30.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
GO111MODULE="on" go install sigs.k8s.io/kind@v0.24.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_scheduling_basic.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.23.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.30.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
GO111MODULE="on" go install sigs.k8s.io/kind@v0.24.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_sequence.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.23.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.30.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
GO111MODULE="on" go install sigs.k8s.io/kind@v0.24.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_vcctl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.23.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.30.1/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
GO111MODULE="on" go install sigs.k8s.io/kind@v0.24.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.31.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
GOOS=${OS} go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ;\
GOOS=${OS} go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ kubectl create -f _output/release/volcano-monitoring-latest.yaml

## Kubernetes compatibility

| | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | Kubernetes 1.29 |Kubernetes 1.30 |
|-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|---------------|
| Volcano v1.6 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | - | - | - |- |
| Volcano v1.7 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |_ |
| Volcano v1.8 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |- |
| Volcano v1.9 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |- |
| Volcano v1.10 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |
| Volcano HEAD (master) | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |
| | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | Kubernetes 1.29 |Kubernetes 1.30 |Kubernetes 1.31 |
|-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|---------------|---------------|
| Volcano v1.6 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | - | - | - |- |- |
| Volcano v1.7 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |_ |_ |
| Volcano v1.8 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |- |_ |
| Volcano v1.9 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |- |_ |
| Volcano v1.10 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |_ |
| Volcano HEAD (master) | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |✓ |

Key:
* `✓` Volcano and the Kubernetes version are exactly compatible.
Expand Down
2 changes: 1 addition & 1 deletion config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.4
name: jobflows.flow.volcano.sh
spec:
group: flow.volcano.sh
Expand Down
45 changes: 37 additions & 8 deletions config/crd/jobflow/bases/flow.volcano.sh_jobtemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.4
name: jobtemplates.flow.volcano.sh
spec:
group: flow.volcano.sh
Expand Down Expand Up @@ -832,6 +832,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -938,6 +939,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1019,6 +1021,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -1136,6 +1140,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1537,6 +1542,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1643,6 +1649,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -1724,6 +1731,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -1841,6 +1850,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2256,6 +2266,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2362,6 +2373,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2443,6 +2455,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -2560,6 +2574,7 @@ spec:
format: int32
type: integer
service:
default: ""
type: string
required:
- port
Expand Down Expand Up @@ -2724,13 +2739,10 @@ spec:
properties:
name:
type: string
source:
properties:
resourceClaimName:
type: string
resourceClaimTemplateName:
type: string
type: object
resourceClaimName:
type: string
resourceClaimTemplateName:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -2806,6 +2818,8 @@ spec:
type: integer
type: array
x-kubernetes-list-type: atomic
supplementalGroupsPolicy:
type: string
sysctls:
items:
properties:
Expand Down Expand Up @@ -2945,10 +2959,12 @@ spec:
diskURI:
type: string
fsType:
default: ext4
type: string
kind:
type: string
readOnly:
default: false
type: boolean
required:
- diskName
Expand Down Expand Up @@ -3325,6 +3341,13 @@ spec:
required:
- path
type: object
image:
properties:
pullPolicy:
type: string
reference:
type: string
type: object
iscsi:
properties:
chapAuthDiscovery:
Expand All @@ -3338,6 +3361,7 @@ spec:
iqn:
type: string
iscsiInterface:
default: default
type: string
lun:
format: int32
Expand Down Expand Up @@ -3586,13 +3610,15 @@ spec:
image:
type: string
keyring:
default: /etc/ceph/keyring
type: string
monitors:
items:
type: string
type: array
x-kubernetes-list-type: atomic
pool:
default: rbd
type: string
readOnly:
type: boolean
Expand All @@ -3604,6 +3630,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
user:
default: admin
type: string
required:
- image
Expand All @@ -3612,6 +3639,7 @@ spec:
scaleIO:
properties:
fsType:
default: xfs
type: string
gateway:
type: string
Expand All @@ -3629,6 +3657,7 @@ spec:
sslEnabled:
type: boolean
storageMode:
default: ThinProvisioned
type: string
storagePool:
type: string
Expand Down
Loading

0 comments on commit 1ab6088

Please sign in to comment.