Merge branch 'master' into SubnetAddressSpace_K8sSwiftv2

Azure · Jul 9, 2024 · 02fca1e · 02fca1e
2 parents 45393a9 + 662ae87
commit 02fca1e
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 2 deletions.
diff --git a/crd/multitenancy/api/v1alpha1/nodeinfo.go b/crd/multitenancy/api/v1alpha1/nodeinfo.go
@@ -12,13 +12,16 @@ import (
 // +kubebuilder:object:root=true
 
 // NodeInfo is the Schema for the NodeInfo API
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName=ni,scope=Cluster,path=nodeinfo
 // +kubebuilder:printcolumn:name="VMUniqueID",type=string,priority=0,JSONPath=`.spec.vmUniqueID`
+// +kubebuilder:printcolumn:name="Status",type=string,priority=1,JSONPath=`.status.status`
 type NodeInfo struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec NodeInfoSpec `json:"spec,omitempty"`
+	Spec   NodeInfoSpec   `json:"spec,omitempty"`
+	Status NodeInfoStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -36,6 +39,17 @@ type NodeInfoSpec struct {
 	VMUniqueID string `json:"vmUniqueID,omitempty"`
 }
 
+// NodeInfoStatus defines the observed state of NodeInfo
+type NodeInfoStatus struct {
+	// +kubebuilder:validation:Optional
+	DeviceInfos []DeviceInfo `json:"deviceInfos,omitempty"`
+}
+
+type DeviceInfo struct {
+	DeviceType  DeviceType `json:"deviceType,omitempty"`
+	DeviceCount int        `json:"deviceCount"`
+}
+
 func init() {
 	SchemeBuilder.Register(&NodeInfo{}, &NodeInfoList{})
 }
diff --git a/crd/multitenancy/api/v1alpha1/zz_generated.deepcopy.go b/crd/multitenancy/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml
@@ -20,6 +20,10 @@ spec:
     - jsonPath: .spec.vmUniqueID
       name: VMUniqueID
       type: string
+    - jsonPath: .status.status
+      name: Status
+      priority: 1
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -43,7 +47,26 @@ spec:
               vmUniqueID:
                 type: string
             type: object
+          status:
+            description: NodeInfoStatus defines the observed state of NodeInfo
+            properties:
+              deviceInfos:
+                items:
+                  properties:
+                    deviceCount:
+                      type: integer
+                    deviceType:
+                      enum:
+                      - acn.azure.com/vnet-nic
+                      - acn.azure.com/infiniband-nic
+                      type: string
+                  required:
+                  - deviceCount
+                  type: object
+                type: array
+            type: object
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}