Rename cluster capacity to cluster info

tardieu · tardieu · commit 59fb04785cd2 · 2023-09-21T07:55:47.000-04:00
diff --git a/PROJECT b/PROJECT
@@ -23,7 +23,7 @@ resources:
   controller: true
   domain: codeflare.dev
   group: mcad
-  kind: ClusterCapacity
+  kind: ClusterInfo
   path: github.com/tardieu/mcad/api/v1beta1
   version: v1beta1
 version: "3"
diff --git a/api/v1beta1/clusterinfo_types.go b/api/v1beta1/clusterinfo_types.go
@@ -21,37 +21,37 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// ClusterCapacitySpec defines the desired state of ClusterCapacity
-type ClusterCapacitySpec struct {
+// ClusterInfoSpec defines the desired state of ClusterInfo
+type ClusterInfoSpec struct {
 }
 
-// ClusterCapacityStatus defines the observed state of ClusterCapacity
-type ClusterCapacityStatus struct {
+// ClusterInfoStatus defines the observed state of ClusterInfo
+type ClusterInfoStatus struct {
 	// Capacity available on the cluster
 	Capacity v1.ResourceList `json:"capacity"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// ClusterCapacity is the Schema for the clustercapacities API
-type ClusterCapacity struct {
+// ClusterInfo is the Schema for the clusterinfoes API
+type ClusterInfo struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ClusterCapacitySpec   `json:"spec,omitempty"`
-	Status ClusterCapacityStatus `json:"status,omitempty"`
+	Spec   ClusterInfoSpec   `json:"spec,omitempty"`
+	Status ClusterInfoStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
-// ClusterCapacityList contains a list of ClusterCapacity
-type ClusterCapacityList struct {
+// ClusterInfoList contains a list of ClusterInfo
+type ClusterInfoList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ClusterCapacity `json:"items"`
+	Items           []ClusterInfo `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&ClusterCapacity{}, &ClusterCapacityList{})
+	SchemeBuilder.Register(&ClusterInfo{}, &ClusterInfoList{})
 }
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/cluster-info.yaml b/cluster-info.yaml
@@ -1,5 +1,5 @@
 apiVersion: mcad.codeflare.dev/v1beta1
-kind: ClusterCapacity
+kind: ClusterInfo
 metadata:
   namespace: default
   name: kind
diff --git a/cmd/main.go b/cmd/main.go
@@ -112,12 +112,12 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "AppWrapper")
 		os.Exit(1)
 	}
-	if err = (&controller.ClusterCapacityReconciler{
+	if err = (&controller.ClusterInfoReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 		Mode:   mode, // default, dispatcher, runner
 	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "ClusterCapacity")
+		setupLog.Error(err, "unable to create controller", "controller", "ClusterInfo")
 		os.Exit(1)
 	}
 	//+kubebuilder:scaffold:builder
diff --git a/config/crd/bases/mcad.codeflare.dev_clusterinfoes.yaml b/config/crd/bases/mcad.codeflare.dev_clusterinfoes.yaml
@@ -4,20 +4,20 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.12.0
-  name: clustercapacities.mcad.codeflare.dev
+  name: clusterinfoes.mcad.codeflare.dev
 spec:
   group: mcad.codeflare.dev
   names:
-    kind: ClusterCapacity
-    listKind: ClusterCapacityList
-    plural: clustercapacities
-    singular: clustercapacity
+    kind: ClusterInfo
+    listKind: ClusterInfoList
+    plural: clusterinfoes
+    singular: clusterinfo
   scope: Namespaced
   versions:
   - name: v1beta1
     schema:
       openAPIV3Schema:
-        description: ClusterCapacity is the Schema for the clustercapacities API
+        description: ClusterInfo is the Schema for the clusterinfoes API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -32,10 +32,10 @@ spec:
           metadata:
             type: object
           spec:
-            description: ClusterCapacitySpec defines the desired state of ClusterCapacity
+            description: ClusterInfoSpec defines the desired state of ClusterInfo
             type: object
           status:
-            description: ClusterCapacityStatus defines the observed state of ClusterCapacity
+            description: ClusterInfoStatus defines the observed state of ClusterInfo
             properties:
               capacity:
                 additionalProperties:
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -3,20 +3,20 @@
 # It should be run by config/default
 resources:
 - bases/mcad.codeflare.dev_appwrappers.yaml
-- bases/mcad.codeflare.dev_clustercapacities.yaml
+- bases/mcad.codeflare.dev_clusterinfoes.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- path: patches/webhook_in_appwrappers.yaml
-#- path: patches/webhook_in_clustercapacities.yaml
+#- path: patches/webhook_in_clusterinfoes.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
 #- path: patches/cainjection_in_appwrappers.yaml
-#- path: patches/cainjection_in_clustercapacities.yaml
+#- path: patches/cainjection_in_clusterinfoes.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
diff --git a/config/crd/patches/webhook_in_clusterinfoes.yaml b/config/crd/patches/webhook_in_clusterinfoes.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: clustercapacities.mcad.codeflare.dev
+  name: clusterinfoes.mcad.codeflare.dev
 spec:
   conversion:
     strategy: Webhook
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -13,7 +13,7 @@ rules:
 - apiGroups:
   - mcad.codeflare.dev
   resources:
-  - clustercapacities
+  - clusterinfoes
   verbs:
   - create
   - delete
@@ -25,13 +25,13 @@ rules:
 - apiGroups:
   - mcad.codeflare.dev
   resources:
-  - clustercapacities/finalizers
+  - clusterinfoes/finalizers
   verbs:
   - update
 - apiGroups:
   - mcad.codeflare.dev
   resources:
-  - clustercapacities/status
+  - clusterinfoes/status
   verbs:
   - get
   - patch
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -1,5 +1,5 @@
 ## Append samples of your project ##
 resources:
 - mcad_v1beta1_appwrapper.yaml
-- mcad_v1beta1_clustercapacity.yaml
+- mcad_v1beta1_clusterinfo.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/config/samples/mcad_v1beta1_clusterinfo.yaml b/config/samples/mcad_v1beta1_clusterinfo.yaml
@@ -1,12 +1,12 @@
 apiVersion: mcad.codeflare.dev/v1beta1
-kind: ClusterCapacity
+kind: ClusterInfo
 metadata:
   labels:
-    app.kubernetes.io/name: clustercapacity
-    app.kubernetes.io/instance: clustercapacity-sample
+    app.kubernetes.io/name: clusterinfo
+    app.kubernetes.io/instance: clusterinfo-sample
     app.kubernetes.io/part-of: mcad
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/created-by: mcad
-  name: clustercapacity-sample
+  name: clusterinfo-sample
 spec:
   # TODO(user): Add fields here
diff --git a/internal/controller/appwrapper_controller.go b/internal/controller/appwrapper_controller.go
@@ -262,7 +262,7 @@ func (r *AppWrapperReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		// watch for cluster capacity changes and trigger dispatch event
 		// watch for dispatch event (on queued, deleted, succeeded states and cluster capacity changes)
 		builder = builder.
-			Watches(&mcadv1beta1.ClusterCapacity{}, handler.EnqueueRequestsFromMapFunc(r.clusterCapacityMapFunc)).
+			Watches(&mcadv1beta1.ClusterInfo{}, handler.EnqueueRequestsFromMapFunc(r.clusterInfoMapFunc)).
 			WatchesRawSource(&source.Channel{Source: r.Events}, &handler.EnqueueRequestForObject{})
 	}
 	return builder.Complete(r)
@@ -280,7 +280,7 @@ func (r *AppWrapperReconciler) podMapFunc(ctx context.Context, obj client.Object
 }
 
 // Trigger dispatchNext on cluster capacity change
-func (r *AppWrapperReconciler) clusterCapacityMapFunc(ctx context.Context, obj client.Object) []reconcile.Request {
+func (r *AppWrapperReconciler) clusterInfoMapFunc(ctx context.Context, obj client.Object) []reconcile.Request {
 	r.triggerDispatchNext()
 	return nil
 }
diff --git a/internal/controller/clusterinfo_controller.go b/internal/controller/clusterinfo_controller.go
@@ -30,27 +30,27 @@ import (
 	mcadv1beta1 "github.com/tardieu/mcad/api/v1beta1"
 )
 
-// ClusterCapacityReconciler reconciles a ClusterCapacity object
-type ClusterCapacityReconciler struct {
+// ClusterInfoReconciler reconciles a ClusterInfo object
+type ClusterInfoReconciler struct {
 	client.Client
 	Scheme   *runtime.Scheme
 	NextSync time.Time // when to refresh cluster capacity
 	Mode     string    // default, dispatcher, runner
 }
 
-//+kubebuilder:rbac:groups=mcad.codeflare.dev,resources=clustercapacities,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=mcad.codeflare.dev,resources=clustercapacities/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=mcad.codeflare.dev,resources=clustercapacities/finalizers,verbs=update
+//+kubebuilder:rbac:groups=mcad.codeflare.dev,resources=clusterinfoes,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=mcad.codeflare.dev,resources=clusterinfoes/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=mcad.codeflare.dev,resources=clusterinfoes/finalizers,verbs=update
 
-func (r *ClusterCapacityReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *ClusterInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)
 
-	// TODO check ClusterCapacity id matches cluster id
+	// TODO check ClusterInfo id matches cluster id
 
 	if !time.Now().After(r.NextSync) {
 		return ctrl.Result{Requeue: true}, nil
 	}
-	cc := &mcadv1beta1.ClusterCapacity{}
+	cc := &mcadv1beta1.ClusterInfo{}
 	if err := r.Get(ctx, req.NamespacedName, cc); err != nil {
 		panic(err)
 	}
@@ -89,16 +89,16 @@ func (r *ClusterCapacityReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	if err := r.Status().Update(ctx, cc); err != nil {
 		return ctrl.Result{}, err
 	}
-	r.NextSync = time.Now().Add(clusterCapacityTimeout)
-	return ctrl.Result{RequeueAfter: clusterCapacityTimeout}, nil
+	r.NextSync = time.Now().Add(clusterInfoTimeout)
+	return ctrl.Result{RequeueAfter: clusterInfoTimeout}, nil
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *ClusterCapacityReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *ClusterInfoReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	if r.Mode == "dispatcher" {
 		return nil
 	}
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&mcadv1beta1.ClusterCapacity{}).
+		For(&mcadv1beta1.ClusterInfo{}).
 		Complete(r)
 }
diff --git a/internal/controller/dispatch_logic.go b/internal/controller/dispatch_logic.go
diff --git a/internal/controller/timings.go b/internal/controller/timings.go
diff --git a/syncer/syncer.js b/syncer/syncer.js
