Simplified NFTopology CRDs

config/crd/bases/topology.nephio.org_nftopologies.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: nftopologies.topology.nephio.org
 spec:
   group: topology.nephio.org
@@ -33,6 +32,7 @@ spec:
           metadata:
             type: object
           spec:
+            description: NFTopologySpec defines the specification of NFTopology
             properties:
               nfInstances:
                 items:
@@ -123,10 +123,6 @@ spec:
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
                           type: object
-                        className:
-                          description: ClassName --- for now, the NFClass this NF
-                            template will derive from
-                          type: string
                         nfInterfaces:
                           description: NFInterfaces
                           items:
@@ -146,12 +142,37 @@ spec:
                             - networkInstanceName
                             type: object
                           type: array
+                        nfPackageRef:
+                          description: NFPackageRef specifies the upstream package
+                            reference for this NFTemplate
+                          properties:
+                            namespace:
+                              description: Namespace is the namespace for both the
+                                repository and package revision
+                              type: string
+                            packageName:
+                              description: PackageName is the name of the package
+                                for the revision
+                              type: string
+                            repository:
+                              description: Repository is the name of the repository
+                                containing the package
+                              type: string
+                            revision:
+                              description: Revision is the specific version number
+                                of the revision of the package
+                              type: string
+                          required:
+                          - packageName
+                          - repository
+                          - revision
+                          type: object
                         nfType:
                           description: NFType specifies the type of NF this template
                             is specifying
                           type: string
                       required:
-                      - className
+                      - nfPackageRef
                       - nfType
                       type: object
                   required:
@@ -165,6 +186,48 @@ spec:
             type: object
           status:
             description: NFTopologyStatus defines the observed state of NFTopology
+            properties:
+              conditions:
+                description: Current service state of the NF.
+                items:
+                  type: string
+                type: array
+              nfInstances:
+                description: Detail on the deployed instances.
+                items:
+                  description: NFDeployedInstance defines an NF instance that is deployed
+                  properties:
+                    clusterName:
+                      description: name of workload cluster where the NF instance
+                        is to be deployed
+                      type: string
+                    connectivities:
+                      description: list of connected NF instances to this NF instance
+                      items:
+                        properties:
+                          neighborName:
+                            description: peer NF's Id (see NFInstance struct below)
+                            type: string
+                        type: object
+                      type: array
+                    id:
+                      description: unique ID for this NF instance
+                      type: string
+                    nfType:
+                      description: 'type of NF, example: amf, smf, upf'
+                      type: string
+                    nfVendor:
+                      description: NF vendor name
+                      type: string
+                    nfVersion:
+                      description: the software version of this NF vendor's NFType
+                      type: string
+                  type: object
+                type: array
+              numNFDeployed:
+                description: Number of NFs deployed for this topology
+                format: int32
+                type: integer
             type: object
         type: object
     served: true