manual changes

Huang-Wei · Huang-Wei · commit d9229f685a4e · 2023-02-27T21:58:46.000-08:00
diff --git a/PROJECT b/PROJECT
@@ -1,4 +1,4 @@
-domain: scheduling.sigs.k8s.io
+domain: scheduling.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 multigroup: true
@@ -8,15 +8,15 @@ resources:
 - api:
     crdVersion: v1
   controller: true
-  domain: scheduling.sigs.k8s.io
+  domain: scheduling.x-k8s.io
   group: scheduling
   kind: PodGroup
   path: sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
   controller: true
-  domain: scheduling.sigs.k8s.io
+  domain: scheduling.x-k8s.io
   group: scheduling
   kind: ElasticQuota
   path: sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1
diff --git a/apis/scheduling/doc.go b/apis/scheduling/doc.go
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +kubebuilder:object:generate=true
-// +groupName=scheduling.sigs.k8s.io
+// +groupName=scheduling.x-k8s.io
 
 package scheduling
diff --git a/apis/scheduling/groupversion_info.go b/apis/scheduling/groupversion_info.go
@@ -18,5 +18,5 @@ package scheduling
 
 // GroupName is the group name used in this package
 const (
-	GroupName = "scheduling.sigs.k8s.io"
+	GroupName = "scheduling.x-k8s.io"
 )
diff --git a/apis/scheduling/v1alpha1/doc.go b/apis/scheduling/v1alpha1/doc.go
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +kubebuilder:object:generate=true
-// +groupName=scheduling.sigs.k8s.io
+// +groupName=scheduling.x-k8s.io
 
 package v1alpha1
diff --git a/apis/scheduling/v1alpha1/groupversion_info.go b/apis/scheduling/v1alpha1/groupversion_info.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the scheduling.sigs.k8s.io v1alpha1 API group
+// Package v1alpha1 contains API Schema definitions for the scheduling.x-k8s.io v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=scheduling.sigs.k8s.io
+// +groupName=scheduling.x-k8s.io
 package v1alpha1
 
 import (
diff --git a/apis/scheduling/v1alpha1/types.go b/apis/scheduling/v1alpha1/types.go
@@ -23,6 +23,7 @@ import (
 )
 
 // ElasticQuota sets elastic quota restrictions per namespace
+// +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName={eq,eqs}
@@ -115,6 +116,7 @@ const (
 )
 
 // PodGroup is a collection of Pod; used for batch workload.
+// +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName={pg,pgs}
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,8 +2,8 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/scheduling.sigs.k8s.io_podgroups.yaml
-- bases/scheduling.sigs.k8s.io_elasticquota.yaml
+- bases/scheduling.x-k8s.io_podgroups.yaml
+- bases/scheduling.x-k8s.io_elasticquota.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
diff --git a/config/crd/patches/cainjection_in_elasticquota.yaml b/config/crd/patches/cainjection_in_elasticquota.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: elasticquota.scheduling.sigs.k8s.io
+  name: elasticquota.scheduling.x-k8s.io
diff --git a/config/crd/patches/cainjection_in_podgroups.yaml b/config/crd/patches/cainjection_in_podgroups.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: podgroups.scheduling.sigs.k8s.io
+  name: podgroups.scheduling.x-k8s.io
diff --git a/config/crd/patches/webhook_in_podgroups.yaml b/config/crd/patches/webhook_in_podgroups.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: podgroups.scheduling.sigs.k8s.io
+  name: podgroups.scheduling.x-k8s.io
 spec:
   conversion:
     strategy: Webhook
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -7,7 +7,7 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - scheduling.sigs.k8s.io
+  - scheduling.x-k8s.io
   resources:
   - elasticquota
   verbs:
@@ -19,21 +19,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - scheduling.sigs.k8s.io
+  - scheduling.x-k8s.io
   resources:
   - elasticquota/finalizers
   verbs:
   - update
 - apiGroups:
-  - scheduling.sigs.k8s.io
+  - scheduling.x-k8s.io
   resources:
   - elasticquota/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - scheduling.sigs.k8s.io
+  - scheduling.x-k8s.io
   resources:
   - podgroups
   verbs:
@@ -45,13 +45,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - scheduling.sigs.k8s.io
+  - scheduling.x-k8s.io
   resources:
   - podgroups/finalizers
   verbs:
   - update
 - apiGroups:
-  - scheduling.sigs.k8s.io
+  - scheduling.x-k8s.io
   resources:
   - podgroups/status
   verbs:
diff --git a/doc/install.md b/doc/install.md
@@ -125,7 +125,7 @@ any vanilla Kubernetes scheduling capability. Instead, a lot of extra out-of-box
     plugin. Here we install coscheduling CRD:
 
     ```bash
-    $ kubectl apply -f manifests/crds/scheduling.sigs.k8s.io_podgroups.yaml
+    $ kubectl apply -f manifests/crds/scheduling.x-k8s.io_podgroups.yaml
     ```
 
 1. Modify `/etc/kubernetes/manifests/kube-scheduler.yaml` to run scheduler-plugins with coscheduling
@@ -180,7 +180,7 @@ Now, we're able to verify how the coscheduling plugin works.
 
     ```yaml
     # podgroup.yaml
-    apiVersion: scheduling.sigs.k8s.io/v1alpha1
+    apiVersion: scheduling.x-k8s.io/v1alpha1
     kind: PodGroup
     metadata:
       name: pg1
@@ -193,7 +193,7 @@ Now, we're able to verify how the coscheduling plugin works.
     $ kubectl apply -f podgroup.yaml
     ```
 
-1. Create a deployment labelled `pod-group.scheduling.sigs.k8s.io: pg1` to associated with PodGroup
+1. Create a deployment labelled `pod-group.scheduling.x-k8s.io: pg1` to associated with PodGroup
    `pg1` created in the previous step.
 
     ```yaml
@@ -211,7 +211,7 @@ Now, we're able to verify how the coscheduling plugin works.
         metadata:
           labels:
             app: pause
-            pod-group.scheduling.sigs.k8s.io: pg1
+            pod-group.scheduling.x-k8s.io: pg1
         spec:
           containers:
           - name: pause
@@ -265,12 +265,12 @@ Now, we're able to verify how the coscheduling plugin works.
 
     ```bash
     $ kubectl get podgroup pg1 -o yaml
-    apiVersion: scheduling.sigs.k8s.io/v1alpha1
+    apiVersion: scheduling.x-k8s.io/v1alpha1
     kind: PodGroup
     metadata:
       annotations:
         kubectl.kubernetes.io/last-applied-configuration: |
-          {"apiVersion":"scheduling.sigs.k8s.io/v1alpha1","kind":"PodGroup","metadata":{"annotations":{},"name":"pg1","namespace":"default"},"spec":{"minMember":3,"scheduleTimeoutSeconds":10}}
+          {"apiVersion":"scheduling.x-k8s.io/v1alpha1","kind":"PodGroup","metadata":{"annotations":{},"name":"pg1","namespace":"default"},"spec":{"minMember":3,"scheduleTimeoutSeconds":10}}
       creationTimestamp: "2022-02-08T19:55:24Z"
       generation: 8
       name: pg1
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -43,6 +43,13 @@ bash "${CODEGEN_PKG}"/generate-internal-groups.sh \
   --output-base "./" \
   --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt
 
+bash "${CODEGEN_PKG}"/generate-groups.sh \
+  all \
+  sigs.k8s.io/scheduler-plugins/pkg/generated \
+  sigs.k8s.io/scheduler-plugins/apis \
+  "scheduling:v1alpha1" \
+  --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt
+
 ${CONTROLLER_GEN} object:headerFile="hack/boilerplate/boilerplate.generatego.txt" \
   paths="./apis/scheduling/..."
 
diff --git a/kep/2-lightweight-coscheduling/README.md b/kep/2-lightweight-coscheduling/README.md
@@ -54,12 +54,12 @@ In order to implement coscheduling, we developed plugins in different extension
 
 ### PodGroup
 
-We use a special label named ```pod-group.scheduling.sigs.k8s.io/name``` to define a PodGroup. Pods that set this label and use the same value belong to the same PodGroup. This is a short term solution, in the future if the definition of `PodGroup` is accepted by the community, we will define it directly through the CRD of `PodGroup`. This is not the focus of this proposal. 
+We use a special label named ```pod-group.scheduling.x-k8s.io/name``` to define a PodGroup. Pods that set this label and use the same value belong to the same PodGroup. This is a short term solution, in the future if the definition of `PodGroup` is accepted by the community, we will define it directly through the CRD of `PodGroup`. This is not the focus of this proposal. 
 
 ```yaml 
 labels:
-     pod-group.scheduling.sigs.k8s.io/name: nginx
-     pod-group.scheduling.sigs.k8s.io/min-available: "2"
+     pod-group.scheduling.x-k8s.io/name: nginx
+     pod-group.scheduling.x-k8s.io/min-available: "2"
 ``` 
 `Pods` in the same `PodGroup` with different priorities might lead to unintended behavior, so need to ensure `Pods` in the same `PodGroup` with the same priority.
 
diff --git a/kep/205-preemption-toleration/README.md b/kep/205-preemption-toleration/README.md
@@ -105,15 +105,15 @@ type PreemptionToleration struct {
 }
 ```
 
-Users specifies the preemption toleration policy as an annotation with the key `preemption-toleration.scheduling.sigs.k8s.io/<property_name>` in `PriorityClass` as below:
+Users specifies the preemption toleration policy as an annotation with the key `preemption-toleration.scheduling.x-k8s.io/<property_name>` in `PriorityClass` as below:
 
 ```yaml
 kind: PriorityClass
 metadata:
   name: toleration-policy-sample
   annotation:
-    preemption-toleration.scheduling.sigs.k8s.io/minimum-preemptable-priority: "10000"
-    preemption-toleration.scheduling.sigs.k8s.io/toleration-seconds: "3600"
+    preemption-toleration.scheduling.x-k8s.io/minimum-preemptable-priority: "10000"
+    preemption-toleration.scheduling.x-k8s.io/toleration-seconds: "3600"
 value: 8000
 ```
 
@@ -154,9 +154,9 @@ metadata:
   name: low-non-preempted
   annotation:
     # This priority class can tolerate preemption by priority with p < 10000.
-    preemption-toleration.scheduling.sigs.k8s.io/minimum-preemptable-priority: "10000"
+    preemption-toleration.scheduling.x-k8s.io/minimum-preemptable-priority: "10000"
     # This priority class can tolerate preemption forever by priority with p < 10000(=minimum-preemptable-priority)
-    preemption-toleration.scheduling.sigs.k8s.io/toleration-seconds: "-1"
+    preemption-toleration.scheduling.x-k8s.io/toleration-seconds: "-1"
 value: 8000
 ```
 
@@ -187,10 +187,10 @@ metadata:
   name: low-non-preempted-10min
   annotation:
     # This priority class can tolerate preemption by priority with p < 10000.
-    preemption-toleration.scheduling.sigs.k8s.io/minimum-preemptable-priority: "10000"
+    preemption-toleration.scheduling.x-k8s.io/minimum-preemptable-priority: "10000"
     # This priority class can tolerate preemption for 10 minutes (600 seconds) 
     # by priority with p < 10000(=minimum-preemptable-priority)
-    preemption-toleration.scheduling.sigs.k8s.io/toleration-seconds: "600"
+    preemption-toleration.scheduling.x-k8s.io/toleration-seconds: "600"
 value: 8000
 ```
 
diff --git a/kep/9-capacity-scheduling/README.md b/kep/9-capacity-scheduling/README.md
@@ -185,7 +185,7 @@ type ElasticQuotaStatus struct {
 sample yaml is listed below:
 
 ```yaml
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: test
@@ -357,7 +357,7 @@ This is to adhere to the elastic quota's API semantics:
 Below is a simple example. 
 ##### Elastic Quota Configuration for namespace 1
 ```yaml
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: quota1
@@ -370,7 +370,7 @@ spec:
 ```
 ##### Elastic Quota Configuration for namespace 2
 ```yaml
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: quota2
@@ -383,7 +383,7 @@ spec:
 ```
 ##### Elastic Quota Configuration for namespace 3
 ```yaml
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: quota3
@@ -481,7 +481,7 @@ Because of that, it's expected in some cases the scheduler is incapable to give
 Below is a simple example. Suppossed that you have **exactly** 2 nodes in your cluster with the following configuration:
 ##### Elastic Quota Configuration for namespace 1
 ```yaml
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: quota1
@@ -494,7 +494,7 @@ spec:
 ```
 ##### Elastic Quota Configuration for namespace 2
 ```yaml
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: quota2
diff --git a/manifests/capacityscheduling/elasticquota-example.yaml b/manifests/capacityscheduling/elasticquota-example.yaml
@@ -1,4 +1,4 @@
-apiVersion: scheduling.sigs.k8s.io/v1alpha1
+apiVersion: scheduling.x-k8s.io/v1alpha1
 kind: ElasticQuota
 metadata:
   name: test
diff --git a/manifests/install/all-in-one.yaml b/manifests/install/all-in-one.yaml
@@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: system:kube-scheduler:plugins
 rules:
-- apiGroups: ["scheduling.sigs.k8s.io"]
+- apiGroups: ["scheduling.x-k8s.io"]
   resources: ["podgroups", "elasticquotas", "podgroups/status", "elasticquotas/status"]
   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
 # for network-aware plugins add the following lines (scheduler-plugins v.0.24.9)
@@ -50,7 +50,7 @@ rules:
 - apiGroups: [""]
   resources: ["pods"]
   verbs: ["get", "list", "watch"]
-- apiGroups: ["scheduling.sigs.k8s.io"]
+- apiGroups: ["scheduling.x-k8s.io"]
   resources: ["podgroups", "elasticquotas", "podgroups/status", "elasticquotas/status"]
   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
 ---
diff --git a/manifests/install/charts/as-a-second-scheduler/templates/rbac.yaml b/manifests/install/charts/as-a-second-scheduler/templates/rbac.yaml
@@ -63,7 +63,7 @@ rules:
   resources: ["noderesourcetopologies"]
   verbs: ["get", "list", "watch"]
 # resources need to be updated with the scheduler plugins used
-- apiGroups: ["scheduling.sigs.k8s.io"]
+- apiGroups: ["scheduling.x-k8s.io"]
   resources: ["podgroups", "elasticquotas", "podgroups/status", "elasticquotas/status"]
   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
 # for network-aware plugins add the following lines (scheduler-plugins v.0.24.9)
@@ -102,7 +102,7 @@ rules:
   resources: ["noderesourcetopologies"]
   verbs: ["get", "list", "watch"]
 # resources need to be updated with the scheduler plugins used
-- apiGroups: ["scheduling.sigs.k8s.io"]
+- apiGroups: ["scheduling.x-k8s.io"]
   resources: ["podgroups", "elasticquotas", "podgroups/status", "elasticquotas/status"]
   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
 ---
diff --git a/pkg/capacityscheduling/README.md b/pkg/capacityscheduling/README.md
diff --git a/pkg/controllers/CapacityScheduling/elasticquota_controller.go b/pkg/controllers/CapacityScheduling/elasticquota_controller.go
diff --git a/pkg/controllers/podgroup_controller.go b/pkg/controllers/podgroup_controller.go
diff --git a/pkg/coscheduling/README.md b/pkg/coscheduling/README.md
diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go
diff --git a/pkg/preemptiontoleration/README.md b/pkg/preemptiontoleration/README.md
diff --git a/pkg/preemptiontoleration/preemption_toleration_policy.go b/pkg/preemptiontoleration/preemption_toleration_policy.go
diff --git a/test/integration/utils.go b/test/integration/utils.go

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ package scheduling`
`18`	`18`
`19`	`19`	`// GroupName is the group name used in this package`
`20`	`20`	`const (`
`21`		`- GroupName = "scheduling.sigs.k8s.io"`
	`21`	`+ GroupName = "scheduling.x-k8s.io"`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// ElasticQuota sets elastic quota restrictions per namespace`
	`26`	`+// +genclient`
`26`	`27`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`
`27`	`28`	`// +kubebuilder:object:root=true`
`28`	`29`	`// +kubebuilder:resource:shortName={eq,eqs}`
`@@ -115,6 +116,7 @@ const (`
`115`	`116`	`)`
`116`	`117`
`117`	`118`	`// PodGroup is a collection of Pod; used for batch workload.`
	`119`	`+// +genclient`
`118`	`120`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`
`119`	`121`	`// +kubebuilder:object:root=true`
`120`	`122`	`// +kubebuilder:resource:shortName={pg,pgs}`