Merge pull request #3561 from zhanggbj/bump_zone

🌱 Update topology api

Author: k8s-ci-robot

internal/apis/topology/v1alpha1/availability_zone.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2021 VMware, Inc. All Rights Reserved.
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
@@ -7,6 +8,14 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	// AvailabiltyZoneConditionInUse indiciates that the AvailabilityZone is in
+	// use.
+	//
+	//	See Zone.Status for more details.
+	AvailabiltyZoneConditionInUse = "AvailabiltyZoneInUse"
+)
+
 // NamespaceInfo contains identifying information about the vSphere resources
 // used to represent a Kubernetes namespace on individual vSphere Zones.
 type NamespaceInfo struct {
@@ -25,6 +34,24 @@ type NamespaceInfo struct {
 	FolderMoId string `json:"folderMoId,omitempty"`
 }
 
+// SystemInfo contains identifying information about the vSphere resources
+// holding or otherwise used by a Supervisor's system-managed resources in an
+// individual vSphere Zone.
+type SystemInfo struct {
+	// PoolMoIDs are the managed object IDs of the vSphere ResourcePools for
+	// this Supervisor's system-managed resources within a zone. A zone may be
+	// comprised of multiple ResourcePools.
+	// +optional
+	PoolMoIDs []string `json:"poolMoIDs,omitempty"`
+
+	// FolderMoID is the managed object ID of the vSphere Folder for this
+	// Supervisor's system-managed resources. Folders are global and not scoped to
+	// a zone or vSphere cluster, but the FolderMoID is stored here for
+	// convenience.
+	// +optional
+	FolderMoID string `json:"folderMoID,omitempty"`
+}
+
 // AvailabilityZoneSpec defines the desired state of AvailabilityZone.
 type AvailabilityZoneSpec struct {
 	// ClusterComputeResourceMoId is the managed object ID of the vSphere
@@ -35,13 +62,26 @@ type AvailabilityZoneSpec struct {
 	// ClusterComputeResources represented by this availability zone.
 	ClusterComputeResourceMoIDs []string `json:"clusterComputeResourceMoIDs,omitempty"`
 
+	// SystemInfo holds identifying information about vSphere resource grouping
+	// objects used by the Supervisor's system objects. These are typically
+	// the top Supervisor-level "Namespaces" Resource Pools and Folder.
+	// +optional
+	SystemInfo *SystemInfo `json:"systemInfo,omitempty"`
+
 	// Namespaces is a map that enables querying information about the vSphere
 	// objects that make up a Kubernetes Namespace based on its name.
 	Namespaces map[string]NamespaceInfo `json:"namespaces,omitempty"`
 }
 
 // AvailabilityZoneStatus defines the observed state of AvailabilityZone.
 type AvailabilityZoneStatus struct {
+	// +optional
+	// Conditions describes the observed conditions of the AvailabilityZone
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
+	// +optional
+	// MarkedForRemoval describes if the AvailabiltyZone is marked for removal.
+	MarkedForRemoval bool `json:"markedForRemoval,omitempty"`
 }
 
 // AvailabilityZone is the schema for the AvailabilityZone resource for the

internal/apis/topology/v1alpha1/groupversion_info.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2021 VMware, Inc. All Rights Reserved.
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
 // SPDX-License-Identifier: Apache-2.0
 
 // Package v1alpha1 contains API Schema definitions for vSphere topology APIs.

internal/apis/topology/v1alpha1/vsphere_zone.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2022 VMware, Inc. All Rights Reserved.
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1

internal/apis/topology/v1alpha1/zone.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2024 VMware, Inc. All Rights Reserved.
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
@@ -7,6 +8,23 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	// ZoneConditionPersistentVolumeClaimsExist indicates that PVCs exist in the
+	// Zone.
+	ZoneConditionPersistentVolumeClaimsExist = "ZonePersistentVolumeClaimsExist"
+
+	// ZoneConditionPodsExist indicates that Pods exist in the Zone.
+	ZoneConditionPodsExist = "ZonePodsExist"
+
+	// ZoneConditionVirtualMachinesExist indicates that VirtualMachines exist
+	// in the Zone.
+	ZoneConditionVirtualMachinesExist = "ZoneVirtualMachinesExist"
+
+	// ZoneConditionNamespaceResourcePoolReconciled indicates that the
+	// Namespace ResourcePool has been reconciled.
+	ZoneConditionNamespaceResourcePoolReconciled = "ZoneNamespaceResourcePoolReconciled"
+)
+
 // AvailabilityZoneReference describes a reference to the cluster scoped
 // AvailabilityZone object.
 type AvailabilityZoneReference struct {
@@ -21,6 +39,11 @@ type AvailabilityZoneReference struct {
 // VSphereEntityInfo contains the managed object IDs associated with
 // a vSphere entity
 type VSphereEntityInfo struct {
+	// +optional
+	// ClusterMoIDs are the managed object IDs of the vSphere Clusters in an
+	// individual vSphere Zone. A zone may be comprised of multiple Clusters.
+	ClusterMoIDs []string `json:"clusterMoIDs,omitempty"`
+
 	// +optional
 	// PoolMoIDs are the managed object ID of the vSphere ResourcePools
 	// in an individual vSphere Zone. A zone may be comprised of
@@ -33,6 +56,18 @@ type VSphereEntityInfo struct {
 	FolderMoID string `json:"folderMoID,omitempty"`
 }
 
+// VirtualMachineClassAllocationInfo describes the definition of allocations
+// for Virtual Machines of a given class.
+type VirtualMachineClassAllocationInfo struct {
+	// +optional
+	// Identifier of the Virtual Machine class used for allocation.
+	ReservedVMClass string `json:"reservedVmClass,omitempty"`
+
+	// +optional
+	// Number of instances of given Virtual Machine class.
+	Count int64 `json:"count,omitempty"`
+}
+
 // ZoneSpec contains identifying information about the
 // vSphere resources used to represent a Kubernetes namespace on individual
 // vSphere Zones.
@@ -51,13 +86,55 @@ type ZoneSpec struct {
 	// Zone is a reference to the cluster scoped AvailabilityZone this
 	// Zone is derived from.
 	Zone AvailabilityZoneReference `json:"availabilityZoneReference"`
+
+	// +optional
+	// Guaranteed number of reserved Virtual Machine class instances that are available for the
+	// namespace in this zone.
+	VirtualMachineReservations []VirtualMachineClassAllocationInfo `json:"virtualMachineReservations,omitempty"`
+
+	// +optional
+	// CPU limit (in megahertz) for the namespace in this zone in addition to the limits specified as part of
+	// reserved Virtual Machine classes.
+	CPULimitMHz int64 `json:"cpuLimitMHz,omitempty"`
+
+	// +optional
+	// CPU reservation (in megahertz) for the namespace in this zone, for VMs
+	// that are not using reserved Virtual Machine class instances.
+	CPUReservationMHz int64 `json:"cpuReservationMHz,omitempty"`
+
+	// +optional
+	// Memory limit (in mebibytes) for the namespace in this zone in addition
+	// to the limits specified as part of reserved Virtual Machine classes.
+	MemoryLimitMiB int64 `json:"memoryLimitMiB,omitempty"`
+
+	// +optional
+	// Memory reservation (in mebibytes) for the namespace in this zone, for
+	// VMs that are not using reserved Virtual Machine class instances.
+	MemoryReservationMiB int64 `json:"memoryReservationMiB,omitempty"`
+
+	// +optional
+	// Determines whether workloads that don't use a reserved Virtual Machine class
+	// instance can use a DirectPath device.
+	DisallowUnreservedDirectPathUsage bool `json:"disallowUnreservedDirectPathUsage,omitempty"`
+
+	// +optional
+	// AllowedClusterComputeResourceMoIDs are the managed object IDs of the vSphere
+	// ClusterComputeResources in this vSphere Zone on which workloads in this Supervisor
+	// Namespace can be placed on. If empty, all the vSphere Clusters in the vSphere Zone are
+	// candidates to place the workloads in this vSphere Namespace.
+	AllowedClusterComputeResourceMoIDs []string `json:"allowedClusterComputeResourceMoIDs,omitempty"`
 }
 
 // ZoneStatus defines the observed state of Zone.
 type ZoneStatus struct {
 	// +optional
 	// Conditions describes the observed conditions of the Zone
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
+	// +optional
+	// MarkedForRemoval describes if the Zone is marked for removal from the
+	// Namespace.
+	MarkedForRemoval bool `json:"markedForRemoval,omitempty"`
 }
 
 // Zone is the schema for the Zone resource for the vSphere topology API.