Update generated

scylladb · Aug 30, 2024 · 0ee442a · 0ee442a
1 parent 5a2aa51
commit 0ee442a
Show file tree

Hide file tree

Showing 14 changed files with 299 additions and 210 deletions.
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -250,6 +250,7 @@ rules:
   - scylla.scylladb.com
   resources:
   - scyllaoperatorconfigs
+  - scyllaoperatorconfigs/status
   verbs:
   - create
   - delete
@@ -5003,12 +5004,37 @@ spec:
               description: spec defines the desired state of the operator.
               properties:
                 scyllaUtilsImage:
-                  description: scyllaUtilsImage is a Scylla image used for running scylla utilities.
-                  minLength: 1
+                  description: scyllaUtilsImage is a ScyllaDB image used for running ScyllaDB utilities.
+                  type: string
+                unsupportedBashToolsImageOverride:
+                  description: unsupportedBashToolsImageOverride allows to adjust a generic Bash image with extra tools used by the operator for auxiliary purposes. Setting this field renders your cluster unsupported. Use at your own risk.
+                  type: string
+                unsupportedGrafanaImageOverride:
+                  description: unsupportedGrafanaImageOverride allows to adjust Grafana image used by the operator for testing, dev or emergencies. Setting this field renders your cluster unsupported. Use at your own risk.
+                  type: string
+                unsupportedPrometheusVersionOverride:
+                  description: unsupportedPrometheusVersionOverride allows to adjust Prometheus version used by the operator for testing, dev or emergencies. Setting this field renders your cluster unsupported. Use at your own risk.
                   type: string
               type: object
             status:
               description: status defines the observed state of the operator.
+              properties:
+                bashToolsImage:
+                  description: bashToolsImage is a generic Bash image with extra tools used by the operator for auxiliary purposes.
+                  type: string
+                grafanaImage:
+                  description: grafanaImage is the image used by the operator to create a Grafana instance.
+                  type: string
+                observedGeneration:
+                  description: observedGeneration is the most recent generation observed for this ScyllaOperatorConfig. It corresponds to the ScyllaOperatorConfig's generation, which is updated on mutation by the API Server.
+                  format: int64
+                  type: integer
+                prometheusVersion:
+                  description: prometheusVersion is the Prometheus version used by the operator to create a Prometheus instance.
+                  type: string
+                scyllaDBUtilsImage:
+                  description: scyllaDBUtilsImage is the ScyllaDB image used for running ScyllaDB utilities.
+                  type: string
               type: object
           type: object
       served: true
@@ -5242,6 +5268,7 @@ webhooks:
     - UPDATE
     resources:
     - nodeconfigs
+    - scyllaoperatorconfigs
 
 ---
 apiVersion: policy/v1

diff --git a/deploy/operator/00_clusterrole_def.yaml b/deploy/operator/00_clusterrole_def.yaml
@@ -240,6 +240,7 @@ rules:
   - scylla.scylladb.com
   resources:
   - scyllaoperatorconfigs
+  - scyllaoperatorconfigs/status
   verbs:
   - create
   - delete

diff --git a/docs/source/api-reference/groups/scylla.scylladb.com/scyllaoperatorconfigs.rst b/docs/source/api-reference/groups/scylla.scylladb.com/scyllaoperatorconfigs.rst
@@ -77,7 +77,16 @@ object
      - Description
    * - scyllaUtilsImage
      - string
-     - scyllaUtilsImage is a Scylla image used for running scylla utilities.
+     - scyllaUtilsImage is a ScyllaDB image used for running ScyllaDB utilities.
+   * - unsupportedBashToolsImageOverride
+     - string
+     - unsupportedBashToolsImageOverride allows to adjust a generic Bash image with extra tools used by the operator for auxiliary purposes. Setting this field renders your cluster unsupported. Use at your own risk.
+   * - unsupportedGrafanaImageOverride
+     - string
+     - unsupportedGrafanaImageOverride allows to adjust Grafana image used by the operator for testing, dev or emergencies. Setting this field renders your cluster unsupported. Use at your own risk.
+   * - unsupportedPrometheusVersionOverride
+     - string
+     - unsupportedPrometheusVersionOverride allows to adjust Prometheus version used by the operator for testing, dev or emergencies. Setting this field renders your cluster unsupported. Use at your own risk.
 
 .. _api-scylla.scylladb.com-scyllaoperatorconfigs-v1alpha1-.status:
 
@@ -92,3 +101,26 @@ Type
 """"
 object
 
+
+.. list-table::
+   :widths: 25 10 150
+   :header-rows: 1
+
+   * - Property
+     - Type
+     - Description
+   * - bashToolsImage
+     - string
+     - bashToolsImage is a generic Bash image with extra tools used by the operator for auxiliary purposes.
+   * - grafanaImage
+     - string
+     - grafanaImage is the image used by the operator to create a Grafana instance.
+   * - observedGeneration
+     - integer
+     - observedGeneration is the most recent generation observed for this ScyllaOperatorConfig. It corresponds to the ScyllaOperatorConfig's generation, which is updated on mutation by the API Server.
+   * - prometheusVersion
+     - string
+     - prometheusVersion is the Prometheus version used by the operator to create a Prometheus instance.
+   * - scyllaDBUtilsImage
+     - string
+     - scyllaDBUtilsImage is the ScyllaDB image used for running ScyllaDB utilities.
diff --git a/examples/eks/cluster.yaml b/examples/eks/cluster.yaml
@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: scylla
-
 ---
-
 # Scylla Cluster
 apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
@@ -16,88 +14,88 @@ spec:
   agentVersion: 3.3.0
   version: 6.1.0
   sysctls:
-  - "fs.aio-max-nr=2097152"
+    - fs.aio-max-nr=2097152
   datacenter:
     name: us-east-1
     racks:
-    - name: a
-      members: 1
-      storage:
-        storageClassName: scylladb-local-xfs
-        capacity: 1800G
-      resources:
-        limits:
-          cpu: 7
-          memory: 56G
-      placement:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                - key: topology.kubernetes.io/zone
-                  operator: In
-                  values:
-                    - us-east-1a
-                - key: scylla.scylladb.com/node-type
-                  operator: In
-                  values:
-                  - scylla
-        tolerations:
-          - key: role
-            operator: Equal
-            value: scylla-clusters
-            effect: NoSchedule
-    - name: b
-      members: 1
-      storage:
-        storageClassName: scylladb-local-xfs
-        capacity: 1800G
-      resources:
-        limits:
-          cpu: 7
-          memory: 56G
-      placement:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: topology.kubernetes.io/zone
-                operator: In
-                values:
-                - us-east-1b
-              - key: scylla.scylladb.com/node-type
-                operator: In
-                values:
-                - scylla
-        tolerations:
-        - key: role
-          operator: Equal
-          value: scylla-clusters
-          effect: NoSchedule
-    - name: c
-      members: 1
-      storage:
-        storageClassName: scylladb-local-xfs
-        capacity: 1800G
-      resources:
-        limits:
-          cpu: 7
-          memory: 56G
-      placement:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: topology.kubernetes.io/zone
-                operator: In
-                values:
-                - us-east-1c
-              - key: scylla.scylladb.com/node-type
-                operator: In
-                values:
-                - scylla
-        tolerations:
-        - key: role
-          operator: Equal
-          value: scylla-clusters
-          effect: NoSchedule
+      - name: a
+        members: 1
+        storage:
+          storageClassName: scylladb-local-xfs
+          capacity: 1800G
+        resources:
+          limits:
+            cpu: 7
+            memory: 56G
+        placement:
+          nodeAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              nodeSelectorTerms:
+                - matchExpressions:
+                    - key: topology.kubernetes.io/zone
+                      operator: In
+                      values:
+                        - us-east-1a
+                    - key: scylla.scylladb.com/node-type
+                      operator: In
+                      values:
+                        - scylla
+          tolerations:
+            - key: role
+              operator: Equal
+              value: scylla-clusters
+              effect: NoSchedule
+      - name: b
+        members: 1
+        storage:
+          storageClassName: scylladb-local-xfs
+          capacity: 1800G
+        resources:
+          limits:
+            cpu: 7
+            memory: 56G
+        placement:
+          nodeAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              nodeSelectorTerms:
+                - matchExpressions:
+                    - key: topology.kubernetes.io/zone
+                      operator: In
+                      values:
+                        - us-east-1b
+                    - key: scylla.scylladb.com/node-type
+                      operator: In
+                      values:
+                        - scylla
+          tolerations:
+            - key: role
+              operator: Equal
+              value: scylla-clusters
+              effect: NoSchedule
+      - name: c
+        members: 1
+        storage:
+          storageClassName: scylladb-local-xfs
+          capacity: 1800G
+        resources:
+          limits:
+            cpu: 7
+            memory: 56G
+        placement:
+          nodeAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              nodeSelectorTerms:
+                - matchExpressions:
+                    - key: topology.kubernetes.io/zone
+                      operator: In
+                      values:
+                        - us-east-1c
+                    - key: scylla.scylladb.com/node-type
+                      operator: In
+                      values:
+                        - scylla
+          tolerations:
+            - key: role
+              operator: Equal
+              value: scylla-clusters
+              effect: NoSchedule
diff --git a/examples/generic/cluster.yaml b/examples/generic/cluster.yaml
@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: scylla
-
 ---
-
 # Simple Scylla Cluster
 apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
@@ -22,8 +20,8 @@ spec:
     name: us-east-1
     racks:
       - name: us-east-1a
-        scyllaConfig: "scylla-config"
-        scyllaAgentConfig: "scylla-agent-config"
+        scyllaConfig: scylla-config
+        scyllaAgentConfig: scylla-agent-config
         members: 3
         storage:
           capacity: 5Gi

diff --git a/examples/gke/cluster.yaml b/examples/gke/cluster.yaml
@@ -3,9 +3,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: scylla
-
 ---
-
 # Scylla Cluster
 apiVersion: scylla.scylladb.com/v1
 kind: ScyllaCluster
@@ -17,13 +15,13 @@ spec:
   version: 6.1.0
   automaticOrphanedNodeCleanup: true
   sysctls:
-    - "fs.aio-max-nr=2097152"
+    - fs.aio-max-nr=2097152
   datacenter:
     name: <gcp_region>
     racks:
       - name: <gcp_zone>
-        scyllaConfig: "scylla-config"
-        scyllaAgentConfig: "scylla-agent-config"
+        scyllaConfig: scylla-config
+        scyllaAgentConfig: scylla-agent-config
         members: 2
         storage:
           storageClassName: scylladb-local-xfs
@@ -40,10 +38,10 @@ spec:
             requiredDuringSchedulingIgnoredDuringExecution:
               nodeSelectorTerms:
                 - matchExpressions:
-                  - key: failure-domain.beta.kubernetes.io/zone
-                    operator: In
-                    values:
-                      - <gcp_zone>
+                    - key: failure-domain.beta.kubernetes.io/zone
+                      operator: In
+                      values:
+                        - <gcp_zone>
           tolerations:
             - key: role
               operator: Equal

diff --git a/examples/helm/values.cluster.yaml b/examples/helm/values.cluster.yaml
@@ -3,20 +3,19 @@ scyllaImage:
   tag: 6.1.0
 agentImage:
   tag: 3.3.0
-
 # Cluster information
 developerMode: true
 datacenter: us-east-1
 racks:
-- name: us-east-1b
-  members: 2
-  storage:
-    capacity: 5Gi
-    storageClassName: scylladb-local-xfs
-  resources:
-    limits:
-      cpu: 1
-      memory: 1Gi
-    requests:
-      cpu: 1
-      memory: 1Gi
+  - name: us-east-1b
+    members: 2
+    storage:
+      capacity: 5Gi
+      storageClassName: scylladb-local-xfs
+    resources:
+      limits:
+        cpu: 1
+        memory: 1Gi
+      requests:
+        cpu: 1
+        memory: 1Gi