Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove scheduling.v1alpha1 and scheduling.v1alpha2 API #693

Merged
merged 4 commits into from
Feb 8, 2020
Merged

Remove scheduling.v1alpha1 and scheduling.v1alpha2 API #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b46f39
Delete Scheduling API version - v1alpha1, v1alpha2
thandayuthapani Feb 7, 2020
3bd1469
Delete Scheduling API version - Fix UT
thandayuthapani Feb 7, 2020
d515658
Delete Scheduling API version - Fix E2E test
thandayuthapani Feb 7, 2020
4ff6305
Add Scheduling API v1beta1 in Helm Chart
thandayuthapani Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hack/.golint_failures
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
volcano.sh/volcano/pkg/apis/scheduling
volcano.sh/volcano/pkg/apis/scheduling/v1alpha1
volcano.sh/volcano/pkg/apis/scheduling/v1alpha2
volcano.sh/volcano/pkg/apis/scheduling/v1beta1
volcano.sh/volcano/pkg/apis/utils
volcano.sh/volcano/pkg/scheduler/actions/allocate
Expand Down
6 changes: 2 additions & 4 deletions hack/generate-yaml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ ${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespac
-x templates/bus_v1alpha1_command.yaml \
-x templates/controllers.yaml \
-x templates/scheduler.yaml \
-x templates/scheduling_v1alpha1_podgroup.yaml \
-x templates/scheduling_v1alpha1_queue.yaml \
-x templates/scheduling_v1alpha2_podgroup.yaml \
-x templates/scheduling_v1alpha2_queue.yaml \
-x templates/scheduling_v1beta1_podgroup.yaml \
-x templates/scheduling_v1beta1_queue.yaml \
--notes >> ${DEPLOYMENT_FILE}
4 changes: 2 additions & 2 deletions hack/update-gencode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-ge
# instead of the $GOPATH directly. For normal projects this can be dropped.
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
volcano.sh/volcano/pkg/client volcano.sh/volcano/pkg/apis \
"batch:v1alpha1 bus:v1alpha1 scheduling:v1alpha1,v1alpha2,v1beta1" \
"batch:v1alpha1 bus:v1alpha1 scheduling:v1beta1" \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate/boilerplate.go.txt

"${CODEGEN_PKG}/generate-internal-groups.sh" "deepcopy,conversion" \
volcano.sh/volcano/pkg/apis/ volcano.sh/volcano/pkg/apis volcano.sh/volcano/pkg/apis\
"scheduling:v1alpha1,v1alpha2,v1beta1" \
"scheduling:v1beta1" \
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate/boilerplate.go.txt

Expand Down
4 changes: 2 additions & 2 deletions installer/helm/chart/volcano/templates/admission.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["create", "get", "patch"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["queues"]
verbs: ["get", "list"]
- apiGroups: [""]
resources: ["services"]
verbs: ["get"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["podgroups"]
verbs: ["get", "list", "watch"]

Expand Down
2 changes: 1 addition & 1 deletion installer/helm/chart/volcano/templates/controllers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get", "list", "watch", "create", "delete", "update"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["podgroups", "queues", "queues/status"]
verbs: ["get", "list", "watch", "create", "delete", "update"]
- apiGroups: ["scheduling.k8s.io"]
Expand Down
4 changes: 2 additions & 2 deletions installer/helm/chart/volcano/templates/scheduler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ rules:
- apiGroups: ["scheduling.k8s.io"]
resources: ["priorityclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["queues"]
verbs: ["get", "list", "watch", "create", "delete"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["podgroups"]
verbs: ["list", "watch", "update"]

Expand Down
39 changes: 0 additions & 39 deletions installer/helm/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions installer/helm/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...mplates/scheduling_v1alpha2_podgroup.yaml → ...emplates/scheduling_v1beta1_podgroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: podgroups.scheduling.sigs.dev
name: podgroups.scheduling.volcano.sh
spec:
group: scheduling.sigs.dev
group: scheduling.volcano.sh
names:
kind: PodGroup
plural: podgroups
shortNames:
- pg
- podgroup-v1alpha2
- podgroup-v1beta1
scope: Namespaced
validation:
openAPIV3Schema:
Expand Down Expand Up @@ -43,4 +43,4 @@ spec:
type: integer
type: object
type: object
version: v1alpha2
version: v1beta1
8 changes: 4 additions & 4 deletions .../templates/scheduling_v1alpha2_queue.yaml → ...o/templates/scheduling_v1beta1_queue.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: queues.scheduling.sigs.dev
name: queues.scheduling.volcano.sh
spec:
group: scheduling.sigs.dev
group: scheduling.volcano.sh
names:
kind: Queue
plural: queues
shortNames:
- q
- queue-v1alpha2
- queue-v1beta1
scope: Cluster
validation:
openAPIV3Schema:
Expand Down Expand Up @@ -48,6 +48,6 @@ spec:
type: integer
type: object
type: object
version: v1alpha2
version: v1beta1
subresources:
status: {}
110 changes: 15 additions & 95 deletions installer/volcano-development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ rules:
- apiGroups: ["scheduling.k8s.io"]
resources: ["priorityclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["queues"]
verbs: ["get", "list", "watch", "create", "delete"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["podgroups"]
verbs: ["list", "watch", "update"]

Expand Down Expand Up @@ -165,13 +165,13 @@ rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["create", "get", "patch"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["queues"]
verbs: ["get", "list"]
- apiGroups: [""]
resources: ["services"]
verbs: ["get"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["podgroups"]
verbs: ["get", "list", "watch"]

Expand Down Expand Up @@ -318,7 +318,7 @@ rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get", "list", "watch", "create", "delete", "update"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.sigs.dev"]
- apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"]
resources: ["podgroups", "queues", "queues/status"]
verbs: ["get", "list", "watch", "create", "delete", "update"]
- apiGroups: ["scheduling.k8s.io"]
Expand Down Expand Up @@ -620,99 +620,19 @@ status:
storedVersions: []

---
# Source: volcano/templates/scheduling_v1alpha1_podgroup.yaml
# Source: volcano/templates/scheduling_v1beta1_podgroup.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: podgroups.scheduling.incubator.k8s.io
name: podgroups.scheduling.volcano.sh
spec:
group: scheduling.incubator.k8s.io
names:
kind: PodGroup
plural: podgroups
scope: Namespaced
validation:
openAPIV3Schema:
type: object
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
minMember:
format: int32
type: integer
type: object
status:
properties:
succeeded:
format: int32
type: integer
failed:
format: int32
type: integer
running:
format: int32
type: integer
type: object
version: v1alpha1

---
# Source: volcano/templates/scheduling_v1alpha1_queue.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: queues.scheduling.incubator.k8s.io
spec:
group: scheduling.incubator.k8s.io
names:
kind: Queue
plural: queues
scope: Cluster
validation:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
weight:
format: int32
type: integer
type: object
type: object
version: v1alpha1
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---
# Source: volcano/templates/scheduling_v1alpha2_podgroup.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: podgroups.scheduling.sigs.dev
spec:
group: scheduling.sigs.dev
group: scheduling.volcano.sh
names:
kind: PodGroup
plural: podgroups
shortNames:
- pg
- podgroup-v1alpha2
- podgroup-v1beta1
scope: Namespaced
validation:
openAPIV3Schema:
Expand Down Expand Up @@ -746,22 +666,22 @@ spec:
type: integer
type: object
type: object
version: v1alpha2
version: v1beta1

---
# Source: volcano/templates/scheduling_v1alpha2_queue.yaml
# Source: volcano/templates/scheduling_v1beta1_queue.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: queues.scheduling.sigs.dev
name: queues.scheduling.volcano.sh
spec:
group: scheduling.sigs.dev
group: scheduling.volcano.sh
names:
kind: Queue
plural: queues
shortNames:
- q
- queue-v1alpha2
- queue-v1beta1
scope: Cluster
validation:
openAPIV3Schema:
Expand Down Expand Up @@ -800,7 +720,7 @@ spec:
type: integer
type: object
type: object
version: v1alpha2
version: v1beta1
subresources:
status: {}

Loading