Add Capacity fields for Capacity Recommender

adobe · Mar 22, 2023 · 0a677d3 · 0a677d3
1 parent 3030abb
commit 0a677d3
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 250 deletions.
diff --git a/config/crd/bases/registry.ethos.adobe.com_clusters.yaml b/config/crd/bases/registry.ethos.adobe.com_clusters.yaml
@@ -84,6 +84,16 @@ spec:
                 items:
                   type: string
                 type: array
+              capacity:
+                description: Capacity information updated by the Capacity Recommender
+                properties:
+                  clusterCapacity:
+                    type: integer
+                  clusterProvisioning:
+                    type: integer
+                  lastUpdated:
+                    type: string
+                type: object
               cloudProviderRegion:
                 description: The cloud provider standard region
                 type: string

diff --git a/pkg/api/registry/v1/cluster_types.go b/pkg/api/registry/v1/cluster_types.go
@@ -113,6 +113,9 @@ type ClusterSpec struct {
 
 	// Cluster tags that were applied
 	Tags map[string]string `json:"tags,omitempty"`
+
+	// Capacity information updated by the Capacity Recommender
+	Capacity Capacity `json:"capacity,omitempty"`
 }
 
 // Offering the cluster is meant for
@@ -246,6 +249,13 @@ type K8sInfraRelease struct {
 	Release string `json:"release"`
 }
 
+// Capacity information updated by the Capacity Recommender
+type Capacity struct {
+	LastUpdated         string `json:"lastUpdated"`
+	ClusterCapacity     int    `json:"clusterCapacity"`
+	ClusterProvisioning int    `json:"clusterProvisioning"`
+}
+
 // ClusterStatus defines the observed state of Cluster
 type ClusterStatus struct {
 	// Send/Receive Errors

diff --git a/pkg/apiserver/docs/docs.go b/pkg/apiserver/docs/docs.go
@@ -77,7 +77,7 @@ const docTemplate = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/github.com_adobe_cluster-registry_pkg_apiserver_web_handler_v1.clusterList"
+                            "$ref": "#/definitions/v1.clusterList"
                         }
                     },
                     "500": {
@@ -186,7 +186,7 @@ const docTemplate = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/pkg_apiserver_web_handler_v2.clusterList"
+                            "$ref": "#/definitions/v2.clusterList"
                         }
                     },
                     "500": {
@@ -259,98 +259,6 @@ const docTemplate = `{
                 }
             }
         },
-        "github.com_adobe_cluster-registry_pkg_apiserver_web_handler_v1.clusterList": {
-            "type": "object",
-            "properties": {
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/v1.ClusterSpec"
-                    }
-                },
-                "itemsCount": {
-                    "type": "integer"
-                },
-                "limit": {
-                    "type": "integer"
-                },
-                "more": {
-                    "type": "boolean"
-                },
-                "offset": {
-                    "type": "integer"
-                }
-            }
-        },
-        "github.com_adobe_cluster-registry_pkg_apiserver_web_handler_v2.clusterList": {
-            "type": "object",
-            "properties": {
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/v1.ClusterSpec"
-                    }
-                },
-                "itemsCount": {
-                    "type": "integer"
-                },
-                "limit": {
-                    "type": "integer"
-                },
-                "more": {
-                    "type": "boolean"
-                },
-                "offset": {
-                    "type": "integer"
-                }
-            }
-        },
-        "pkg_apiserver_web_handler_v1.clusterList": {
-            "type": "object",
-            "properties": {
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/v1.ClusterSpec"
-                    }
-                },
-                "itemsCount": {
-                    "type": "integer"
-                },
-                "limit": {
-                    "type": "integer"
-                },
-                "more": {
-                    "type": "boolean"
-                },
-                "offset": {
-                    "type": "integer"
-                }
-            }
-        },
-        "pkg_apiserver_web_handler_v2.clusterList": {
-            "type": "object",
-            "properties": {
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/v1.ClusterSpec"
-                    }
-                },
-                "itemsCount": {
-                    "type": "integer"
-                },
-                "limit": {
-                    "type": "integer"
-                },
-                "more": {
-                    "type": "boolean"
-                },
-                "offset": {
-                    "type": "integer"
-                }
-            }
-        },
         "v1.APIServer": {
             "type": "object",
             "properties": {
@@ -387,6 +295,20 @@ const docTemplate = `{
                 }
             }
         },
+        "v1.Capacity": {
+            "type": "object",
+            "properties": {
+                "clusterCapacity": {
+                    "type": "integer"
+                },
+                "clusterProvisioning": {
+                    "type": "integer"
+                },
+                "lastUpdated": {
+                    "type": "string"
+                }
+            }
+        },
         "v1.ClusterSpec": {
             "type": "object",
             "properties": {
@@ -416,6 +338,10 @@ const docTemplate = `{
                         "type": "string"
                     }
                 },
+                "capacity": {
+                    "description": "Capacity information updated by the Capacity Recommender",
+                    "$ref": "#/definitions/v1.Capacity"
+                },
                 "cloudProviderRegion": {
                     "description": "The cloud provider standard region\n+kubebuilder:validation:Required",
                     "type": "string"
@@ -665,6 +591,52 @@ const docTemplate = `{
                     "type": "string"
                 }
             }
+        },
+        "v1.clusterList": {
+            "type": "object",
+            "properties": {
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/v1.ClusterSpec"
+                    }
+                },
+                "itemsCount": {
+                    "type": "integer"
+                },
+                "limit": {
+                    "type": "integer"
+                },
+                "more": {
+                    "type": "boolean"
+                },
+                "offset": {
+                    "type": "integer"
+                }
+            }
+        },
+        "v2.clusterList": {
+            "type": "object",
+            "properties": {
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/v1.ClusterSpec"
+                    }
+                },
+                "itemsCount": {
+                    "type": "integer"
+                },
+                "limit": {
+                    "type": "integer"
+                },
+                "more": {
+                    "type": "boolean"
+                },
+                "offset": {
+                    "type": "integer"
+                }
+            }
         }
     },
     "securityDefinitions": {