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,36 @@ 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
+                          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 +185,105 @@ spec:
             type: object
           status:
             description: NFTopologyStatus defines the observed state of NFTopology
+            properties:
+              conditions:
+                description: Current service state of the NFTopology.
+                items:
+                  description: "Condition contains details for one aspect of the current
+                    state of this API Resource. --- This struct is intended for direct
+                    use as an array at the field path .status.conditions.  For example,
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
+                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the last time the condition
+                        transitioned from one status to another. This should be when
+                        the underlying condition changed.  If that is not known, then
+                        using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message is a human readable message indicating
+                        details about the transition. This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: observedGeneration represents the .metadata.generation
+                        that the condition was set based upon. For instance, if .metadata.generation
+                        is currently 12, but the .status.conditions[x].observedGeneration
+                        is 9, the condition is out of date with respect to the current
+                        state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: reason contains a programmatic identifier indicating
+                        the reason for the condition's last transition. Producers
+                        of specific condition types may define expected values and
+                        meanings for this field, and whether the values are considered
+                        a guaranteed API. The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                        --- Many .condition.type values are consistent across resources
+                        like Available, but because arbitrary conditions can be useful
+                        (see .node.status.conditions), the ability to deconflict is
+                        important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              nfInstances:
+                description: Detail on the deployed instances.
+                items:
+                  description: NFDeployedInstance defines an NF instance that is deployed
+                  properties:
+                    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
+                    nfInstanceName:
+                      description: corresponding NFInstance name
+                      type: string
+                    nfType:
+                      description: 'type of NF, example: amf, smf, upf'
+                      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