Merge pull request #693 from thandayuthapani/schedulingAPI

Remove scheduling.v1alpha1 and scheduling.v1alpha2 API
volcano-sh · Feb 8, 2020 · d5cb25a · d5cb25a
2 parents 51f270a + 4ff6305
commit d5cb25a
Show file tree

Hide file tree

Showing 118 changed files with 1,308 additions and 5,632 deletions.
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -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

diff --git a/hack/generate-yaml.sh b/hack/generate-yaml.sh
@@ -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}
diff --git a/hack/update-gencode.sh b/hack/update-gencode.sh
@@ -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
 

diff --git a/installer/helm/chart/volcano/templates/admission.yaml b/installer/helm/chart/volcano/templates/admission.yaml
@@ -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"]
 

diff --git a/installer/helm/chart/volcano/templates/controllers.yaml b/installer/helm/chart/volcano/templates/controllers.yaml
@@ -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"]

diff --git a/installer/helm/chart/volcano/templates/scheduler.yaml b/installer/helm/chart/volcano/templates/scheduler.yaml
@@ -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"]
 

diff --git a/installer/helm/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml b/installer/helm/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml
diff --git a/installer/helm/chart/volcano/templates/scheduling_v1alpha1_queue.yaml b/installer/helm/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
diff --git a/...mplates/scheduling_v1alpha2_podgroup.yaml → ...emplates/scheduling_v1beta1_podgroup.yaml b/...mplates/scheduling_v1alpha2_podgroup.yaml → ...emplates/scheduling_v1beta1_podgroup.yaml
@@ -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:
@@ -43,4 +43,4 @@ spec:
               type: integer
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
diff --git a/.../templates/scheduling_v1alpha2_queue.yaml → ...o/templates/scheduling_v1beta1_queue.yaml b/.../templates/scheduling_v1alpha2_queue.yaml → ...o/templates/scheduling_v1beta1_queue.yaml
@@ -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:
@@ -48,6 +48,6 @@ spec:
               type: integer
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
   subresources:
     status: {}
diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
@@ -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"]
 
@@ -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"]
 
@@ -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"]
@@ -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:
@@ -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:
@@ -800,7 +720,7 @@ spec:
               type: integer
           type: object
       type: object
-  version: v1alpha2
+  version: v1beta1
   subresources:
     status: {}