Rebuild&generate crd using controller-gen v0.7.0, and add a nil check

Signed-off-by: nizifan <[email protected]>
fluid-cloudnative · Apr 7, 2022 · 67f43c1 · 67f43c1
1 parent 9a010cb
commit 67f43c1
Show file tree

Hide file tree

Showing 15 changed files with 8,495 additions and 6,825 deletions.
diff --git a/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml
diff --git a/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml b/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml
@@ -1,32 +1,13 @@
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: databackups.data.fluid.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .spec.dataset
-    name: Dataset
-    type: string
-  - JSONPath: .status.phase
-    name: Phase
-    type: string
-  - JSONPath: .status.backupLocation.path
-    name: Path
-    type: string
-  - JSONPath: .status.backupLocation.nodeName
-    name: NodeName
-    type: string
-  - JSONPath: .status.duration
-    name: Duration
-    type: string
-  - JSONPath: .metadata.creationTimestamp
-    name: Age
-    type: date
   group: data.fluid.io
   names:
     categories:
@@ -38,113 +19,144 @@ spec:
     - backup
     singular: databackup
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: DataBackup is the Schema for the backup API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: DataBackupSpec defines the desired state of DataBackup
-          properties:
-            backupPath:
-              description: BackupPath defines the target path to save data of the DataBackup
-              type: string
-            dataset:
-              description: Dataset defines the target dataset of the DataBackup
-              type: string
-            runAs:
-              description: Manage the user to run Alluxio DataBackup
-              properties:
-                gid:
-                  description: The gid to run the alluxio runtime
-                  format: int64
-                  type: integer
-                group:
-                  description: The group name to run the alluxio runtime
-                  type: string
-                uid:
-                  description: The uid to run the alluxio runtime
-                  format: int64
-                  type: integer
-                user:
-                  description: The user name to run the alluxio runtime
-                  type: string
-              required:
-              - gid
-              - group
-              - uid
-              - user
-              type: object
-          type: object
-        status:
-          description: DataBackupStatus defines the observed state of DataBackup
-          properties:
-            backupLocation:
-              description: BackupLocation tell user the location to save data of the DataBackup
-              properties:
-                nodeName:
-                  description: NodeName describes the nodeName of backup if Path is in the form of local://subpath
-                  type: string
-                path:
-                  description: Path describes the path of backup, in the form of local:///absolutePath or pvc://<pvcName>/subpath
-                  type: string
-              type: object
-            conditions:
-              description: Conditions consists of transition information on DataBackup's Phase
-              items:
-                description: Condition explains the transitions on phase
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.dataset
+      name: Dataset
+      type: string
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .status.backupLocation.path
+      name: Path
+      type: string
+    - jsonPath: .status.backupLocation.nodeName
+      name: NodeName
+      type: string
+    - jsonPath: .status.duration
+      name: Duration
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: DataBackup is the Schema for the backup API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DataBackupSpec defines the desired state of DataBackup
+            properties:
+              backupPath:
+                description: BackupPath defines the target path to save data of the
+                  DataBackup
+                type: string
+              dataset:
+                description: Dataset defines the target dataset of the DataBackup
+                type: string
+              runAs:
+                description: Manage the user to run Alluxio DataBackup
                 properties:
-                  lastProbeTime:
-                    description: LastProbeTime describes last time this condition was updated.
-                    format: date-time
-                    type: string
-                  lastTransitionTime:
-                    description: LastTransitionTime describes last time the condition transitioned from one status to another.
-                    format: date-time
+                  gid:
+                    description: The gid to run the alluxio runtime
+                    format: int64
+                    type: integer
+                  group:
+                    description: The group name to run the alluxio runtime
                     type: string
-                  message:
-                    description: Message is a human-readable message indicating details about the transition
+                  uid:
+                    description: The uid to run the alluxio runtime
+                    format: int64
+                    type: integer
+                  user:
+                    description: The user name to run the alluxio runtime
                     type: string
-                  reason:
-                    description: Reason for the condition's last transition
-                    type: string
-                  status:
-                    description: Status of the condition, one of `True`, `False` or `Unknown`
+                required:
+                - gid
+                - group
+                - uid
+                - user
+                type: object
+            type: object
+          status:
+            description: DataBackupStatus defines the observed state of DataBackup
+            properties:
+              backupLocation:
+                description: BackupLocation tell user the location to save data of
+                  the DataBackup
+                properties:
+                  nodeName:
+                    description: NodeName describes the nodeName of backup if Path
+                      is in the form of local://subpath
                     type: string
-                  type:
-                    description: Type of condition, either `Complete` or `Failed`
+                  path:
+                    description: Path describes the path of backup, in the form of
+                      local:///absolutePath or pvc://<pvcName>/subpath
                     type: string
-                required:
-                - status
-                - type
                 type: object
-              type: array
-            duration:
-              description: Duration tell user how much time was spent to backup
-              type: string
-            phase:
-              description: Phase describes current phase of DataBackup
-              type: string
-          required:
-          - conditions
-          - duration
-          - phase
-          type: object
-      type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
+              conditions:
+                description: Conditions consists of transition information on DataBackup's
+                  Phase
+                items:
+                  description: Condition explains the transitions on phase
+                  properties:
+                    lastProbeTime:
+                      description: LastProbeTime describes last time this condition
+                        was updated.
+                      format: date-time
+                      type: string
+                    lastTransitionTime:
+                      description: LastTransitionTime describes last time the condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: Message is a human-readable message indicating
+                        details about the transition
+                      type: string
+                    reason:
+                      description: Reason for the condition's last transition
+                      type: string
+                    status:
+                      description: Status of the condition, one of `True`, `False`
+                        or `Unknown`
+                      type: string
+                    type:
+                      description: Type of condition, either `Complete` or `Failed`
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+              duration:
+                description: Duration tell user how much time was spent to backup
+                type: string
+              phase:
+                description: Phase describes current phase of DataBackup
+                type: string
+            required:
+            - conditions
+            - duration
+            - phase
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""