Update generated

scylladb · Feb 16, 2024 · b289f52 · b289f52
1 parent 5e62ff9
commit b289f52
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 8 deletions.
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -308,7 +308,11 @@ spec:
     singular: nodeconfig
   scope: Cluster
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           properties:
@@ -1019,7 +1023,29 @@ spec:
     singular: scyllacluster
   scope: Namespaced
   versions:
-    - name: v1
+    - additionalPrinterColumns:
+        - jsonPath: .status.readyMembers
+          name: READY
+          type: integer
+        - jsonPath: .status.members
+          name: MEMBERS
+          type: integer
+        - jsonPath: .status.rackCount
+          name: RACKS
+          type: integer
+        - jsonPath: .status.conditions[?(@.type=='Available')].status
+          name: AVAILABLE
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Progressing')].status
+          name: PROGRESSING
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Degraded')].status
+          name: DEGRADED
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1
       schema:
         openAPIV3Schema:
           description: ScyllaCluster defines a Scylla cluster.
@@ -3069,6 +3095,10 @@ spec:
             status:
               description: status is the current status of this scylla cluster.
               properties:
+                availableMembers:
+                  description: availableMembers is the number of ScyllaDB members in all racks that are available.
+                  format: int32
+                  type: integer
                 backups:
                   description: backups reflects status of backup tasks.
                   items:
@@ -3179,14 +3209,26 @@ spec:
                 managerId:
                   description: managerId contains ID under which cluster was registered in Scylla Manager.
                   type: string
+                members:
+                  description: members is the number of ScyllaDB members in all racks.
+                  format: int32
+                  type: integer
                 observedGeneration:
                   description: observedGeneration is the most recent generation observed for this ScyllaCluster. It corresponds to the ScyllaCluster's generation, which is updated on mutation by the API Server.
                   format: int64
                   type: integer
+                rackCount:
+                  description: rackCount is the number of ScyllaDB racks in this cluster.
+                  format: int32
+                  type: integer
                 racks:
                   additionalProperties:
                     description: RackStatus is the status of a Scylla Rack
                     properties:
+                      availableMembers:
+                        description: availableMembers is the number of available members in the Rack.
+                        format: int32
+                        type: integer
                       conditions:
                         description: conditions are the latest available observations of a rack's state.
                         items:
@@ -3226,6 +3268,10 @@ spec:
                     type: object
                   description: racks reflect status of cluster racks.
                   type: object
+                readyMembers:
+                  description: readyMembers is the number of ScyllaDB members in all racks that are ready.
+                  format: int32
+                  type: integer
                 repairs:
                   description: repairs reflects status of repair tasks.
                   items:
@@ -3333,7 +3379,20 @@ spec:
     singular: scylladbmonitoring
   scope: Namespaced
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .status.conditions[?(@.type=='Available')].status
+          name: AVAILABLE
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Progressing')].status
+          name: PROGRESSING
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Degraded')].status
+          name: DEGRADED
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           description: ScyllaDBMonitoring defines a monitoring instance for ScyllaDB clusters.
@@ -4837,7 +4896,11 @@ spec:
     singular: scyllaoperatorconfig
   scope: Cluster
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           description: ScyllaOperatorConfig describes the Scylla Operator configuration.

diff --git a/docs/source/api-reference/groups/scylla.scylladb.com/scyllaclusters.rst b/docs/source/api-reference/groups/scylla.scylladb.com/scyllaclusters.rst
@@ -4592,6 +4592,9 @@ object
    * - Property
      - Type
      - Description
+   * - availableMembers
+     - integer
+     - availableMembers is the number of ScyllaDB members in all racks that are available.
    * - :ref:`backups<api-scylla.scylladb.com-scyllaclusters-v1-.status.backups[]>`
      - array (object)
      - backups reflects status of backup tasks.
@@ -4601,12 +4604,21 @@ object
    * - managerId
      - string
      - managerId contains ID under which cluster was registered in Scylla Manager.
+   * - members
+     - integer
+     - members is the number of ScyllaDB members in all racks.
    * - observedGeneration
      - integer
      - observedGeneration is the most recent generation observed for this ScyllaCluster. It corresponds to the ScyllaCluster's generation, which is updated on mutation by the API Server.
+   * - rackCount
+     - integer
+     - rackCount is the number of ScyllaDB racks in this cluster.
    * - :ref:`racks<api-scylla.scylladb.com-scyllaclusters-v1-.status.racks>`
      - object
      - racks reflect status of cluster racks.
+   * - readyMembers
+     - integer
+     - readyMembers is the number of ScyllaDB members in all racks that are ready.
    * - :ref:`repairs<api-scylla.scylladb.com-scyllaclusters-v1-.status.repairs[]>`
      - array (object)
      - repairs reflects status of repair tasks.

diff --git a/pkg/api/scylla/v1/scylla.scylladb.com_scyllaclusters.yaml b/pkg/api/scylla/v1/scylla.scylladb.com_scyllaclusters.yaml
@@ -15,7 +15,29 @@ spec:
     singular: scyllacluster
   scope: Namespaced
   versions:
-    - name: v1
+    - additionalPrinterColumns:
+        - jsonPath: .status.readyMembers
+          name: READY
+          type: integer
+        - jsonPath: .status.members
+          name: MEMBERS
+          type: integer
+        - jsonPath: .status.rackCount
+          name: RACKS
+          type: integer
+        - jsonPath: .status.conditions[?(@.type=='Available')].status
+          name: AVAILABLE
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Progressing')].status
+          name: PROGRESSING
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Degraded')].status
+          name: DEGRADED
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1
       schema:
         openAPIV3Schema:
           description: ScyllaCluster defines a Scylla cluster.
@@ -2065,6 +2087,10 @@ spec:
             status:
               description: status is the current status of this scylla cluster.
               properties:
+                availableMembers:
+                  description: availableMembers is the number of ScyllaDB members in all racks that are available.
+                  format: int32
+                  type: integer
                 backups:
                   description: backups reflects status of backup tasks.
                   items:
@@ -2175,14 +2201,26 @@ spec:
                 managerId:
                   description: managerId contains ID under which cluster was registered in Scylla Manager.
                   type: string
+                members:
+                  description: members is the number of ScyllaDB members in all racks.
+                  format: int32
+                  type: integer
                 observedGeneration:
                   description: observedGeneration is the most recent generation observed for this ScyllaCluster. It corresponds to the ScyllaCluster's generation, which is updated on mutation by the API Server.
                   format: int64
                   type: integer
+                rackCount:
+                  description: rackCount is the number of ScyllaDB racks in this cluster.
+                  format: int32
+                  type: integer
                 racks:
                   additionalProperties:
                     description: RackStatus is the status of a Scylla Rack
                     properties:
+                      availableMembers:
+                        description: availableMembers is the number of available members in the Rack.
+                        format: int32
+                        type: integer
                       conditions:
                         description: conditions are the latest available observations of a rack's state.
                         items:
@@ -2222,6 +2260,10 @@ spec:
                     type: object
                   description: racks reflect status of cluster racks.
                   type: object
+                readyMembers:
+                  description: readyMembers is the number of ScyllaDB members in all racks that are ready.
+                  format: int32
+                  type: integer
                 repairs:
                   description: repairs reflects status of repair tasks.
                   items:

diff --git a/pkg/api/scylla/v1/zz_generated.deepcopy.go b/pkg/api/scylla/v1/zz_generated.deepcopy.go
diff --git a/pkg/api/scylla/v1alpha1/scylla.scylladb.com_nodeconfigs.yaml b/pkg/api/scylla/v1alpha1/scylla.scylladb.com_nodeconfigs.yaml
@@ -15,7 +15,11 @@ spec:
     singular: nodeconfig
   scope: Cluster
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           properties:

diff --git a/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scylladbmonitorings.yaml b/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scylladbmonitorings.yaml
@@ -15,7 +15,20 @@ spec:
     singular: scylladbmonitoring
   scope: Namespaced
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .status.conditions[?(@.type=='Available')].status
+          name: AVAILABLE
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Progressing')].status
+          name: PROGRESSING
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Degraded')].status
+          name: DEGRADED
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           description: ScyllaDBMonitoring defines a monitoring instance for ScyllaDB clusters.

diff --git a/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scyllaoperatorconfigs.yaml b/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scyllaoperatorconfigs.yaml
@@ -15,7 +15,11 @@ spec:
     singular: scyllaoperatorconfig
   scope: Cluster
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           description: ScyllaOperatorConfig describes the Scylla Operator configuration.