merge 0.24.3 to test_refactoring

Altinity · Jan 4, 2025 · b0bd4df · b0bd4df
2 parents b396c27 + 294cdb6
commit b0bd4df
Show file tree

Hide file tree

Showing 26 changed files with 304 additions and 403 deletions.
diff --git a/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml b/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml
@@ -53,11 +53,10 @@ spec:
           type: string
           description: Resource status
           jsonPath: .status.status
-        - name: hosts-unchanged
+        - name: hosts-completed
           type: integer
-          description: Unchanged hosts count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsUnchanged
+          description: Completed hosts count
+          jsonPath: .status.hostsCompleted
         - name: hosts-updated
           type: integer
           description: Updated hosts count
@@ -68,20 +67,11 @@ spec:
           description: Added hosts count
           priority: 1 # show in wide view
           jsonPath: .status.hostsAdded
-        - name: hosts-completed
-          type: integer
-          description: Completed hosts count
-          jsonPath: .status.hostsCompleted
         - name: hosts-deleted
           type: integer
           description: Hosts deleted count
           priority: 1 # show in wide view
           jsonPath: .status.hostsDeleted
-        - name: hosts-delete
-          type: integer
-          description: Hosts to be deleted count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsDelete
         - name: endpoint
           type: string
           description: Client access endpoint

diff --git a/deploy/operator/clickhouse-operator-install-ansible.yaml b/deploy/operator/clickhouse-operator-install-ansible.yaml
@@ -60,11 +60,10 @@ spec:
           type: string
           description: Resource status
           jsonPath: .status.status
-        - name: hosts-unchanged
+        - name: hosts-completed
           type: integer
-          description: Unchanged hosts count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsUnchanged
+          description: Completed hosts count
+          jsonPath: .status.hostsCompleted
         - name: hosts-updated
           type: integer
           description: Updated hosts count
@@ -75,20 +74,11 @@ spec:
           description: Added hosts count
           priority: 1 # show in wide view
           jsonPath: .status.hostsAdded
-        - name: hosts-completed
-          type: integer
-          description: Completed hosts count
-          jsonPath: .status.hostsCompleted
         - name: hosts-deleted
           type: integer
           description: Hosts deleted count
           priority: 1 # show in wide view
           jsonPath: .status.hostsDeleted
-        - name: hosts-delete
-          type: integer
-          description: Hosts to be deleted count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsDelete
         - name: endpoint
           type: string
           description: Client access endpoint
@@ -1352,11 +1342,10 @@ spec:
           type: string
           description: Resource status
           jsonPath: .status.status
-        - name: hosts-unchanged
+        - name: hosts-completed
           type: integer
-          description: Unchanged hosts count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsUnchanged
+          description: Completed hosts count
+          jsonPath: .status.hostsCompleted
         - name: hosts-updated
           type: integer
           description: Updated hosts count
@@ -1367,20 +1356,11 @@ spec:
           description: Added hosts count
           priority: 1 # show in wide view
           jsonPath: .status.hostsAdded
-        - name: hosts-completed
-          type: integer
-          description: Completed hosts count
-          jsonPath: .status.hostsCompleted
         - name: hosts-deleted
           type: integer
           description: Hosts deleted count
           priority: 1 # show in wide view
           jsonPath: .status.hostsDeleted
-        - name: hosts-delete
-          type: integer
-          description: Hosts to be deleted count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsDelete
         - name: endpoint
           type: string
           description: Client access endpoint

diff --git a/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml
@@ -50,11 +50,10 @@ spec:
       type: string
       description: Resource status
       JSONPath: .status.status
-    - name: hosts-unchanged
+    - name: hosts-completed
       type: integer
-      description: Unchanged hosts count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsUnchanged
+      description: Completed hosts count
+      JSONPath: .status.hostsCompleted
     - name: hosts-updated
       type: integer
       description: Updated hosts count
@@ -65,20 +64,11 @@ spec:
       description: Added hosts count
       priority: 1 # show in wide view
       JSONPath: .status.hostsAdded
-    - name: hosts-completed
-      type: integer
-      description: Completed hosts count
-      JSONPath: .status.hostsCompleted
     - name: hosts-deleted
       type: integer
       description: Hosts deleted count
       priority: 1 # show in wide view
       JSONPath: .status.hostsDeleted
-    - name: hosts-delete
-      type: integer
-      description: Hosts to be deleted count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsDelete
     - name: endpoint
       type: string
       description: Client access endpoint
@@ -1332,11 +1322,10 @@ spec:
       type: string
       description: Resource status
       JSONPath: .status.status
-    - name: hosts-unchanged
+    - name: hosts-completed
       type: integer
-      description: Unchanged hosts count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsUnchanged
+      description: Completed hosts count
+      JSONPath: .status.hostsCompleted
     - name: hosts-updated
       type: integer
       description: Updated hosts count
@@ -1347,20 +1336,11 @@ spec:
       description: Added hosts count
       priority: 1 # show in wide view
       JSONPath: .status.hostsAdded
-    - name: hosts-completed
-      type: integer
-      description: Completed hosts count
-      JSONPath: .status.hostsCompleted
     - name: hosts-deleted
       type: integer
       description: Hosts deleted count
       priority: 1 # show in wide view
       JSONPath: .status.hostsDeleted
-    - name: hosts-delete
-      type: integer
-      description: Hosts to be deleted count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsDelete
     - name: endpoint
       type: string
       description: Client access endpoint
@@ -3869,7 +3849,6 @@ metadata:
   namespace: kube-system
   labels:
     clickhouse.altinity.com/chop: 0.24.3
-
 # Template Parameters:
 #
 # NAMESPACE=kube-system

diff --git a/deploy/operator/clickhouse-operator-install-bundle.yaml b/deploy/operator/clickhouse-operator-install-bundle.yaml
@@ -53,11 +53,10 @@ spec:
           type: string
           description: Resource status
           jsonPath: .status.status
-        - name: hosts-unchanged
+        - name: hosts-completed
           type: integer
-          description: Unchanged hosts count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsUnchanged
+          description: Completed hosts count
+          jsonPath: .status.hostsCompleted
         - name: hosts-updated
           type: integer
           description: Updated hosts count
@@ -68,20 +67,11 @@ spec:
           description: Added hosts count
           priority: 1 # show in wide view
           jsonPath: .status.hostsAdded
-        - name: hosts-completed
-          type: integer
-          description: Completed hosts count
-          jsonPath: .status.hostsCompleted
         - name: hosts-deleted
           type: integer
           description: Hosts deleted count
           priority: 1 # show in wide view
           jsonPath: .status.hostsDeleted
-        - name: hosts-delete
-          type: integer
-          description: Hosts to be deleted count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsDelete
         - name: endpoint
           type: string
           description: Client access endpoint
@@ -1345,11 +1335,10 @@ spec:
           type: string
           description: Resource status
           jsonPath: .status.status
-        - name: hosts-unchanged
+        - name: hosts-completed
           type: integer
-          description: Unchanged hosts count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsUnchanged
+          description: Completed hosts count
+          jsonPath: .status.hostsCompleted
         - name: hosts-updated
           type: integer
           description: Updated hosts count
@@ -1360,20 +1349,11 @@ spec:
           description: Added hosts count
           priority: 1 # show in wide view
           jsonPath: .status.hostsAdded
-        - name: hosts-completed
-          type: integer
-          description: Completed hosts count
-          jsonPath: .status.hostsCompleted
         - name: hosts-deleted
           type: integer
           description: Hosts deleted count
           priority: 1 # show in wide view
           jsonPath: .status.hostsDeleted
-        - name: hosts-delete
-          type: integer
-          description: Hosts to be deleted count
-          priority: 1 # show in wide view
-          jsonPath: .status.hostsDelete
         - name: endpoint
           type: string
           description: Client access endpoint

diff --git a/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml
@@ -50,11 +50,10 @@ spec:
       type: string
       description: Resource status
       JSONPath: .status.status
-    - name: hosts-unchanged
+    - name: hosts-completed
       type: integer
-      description: Unchanged hosts count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsUnchanged
+      description: Completed hosts count
+      JSONPath: .status.hostsCompleted
     - name: hosts-updated
       type: integer
       description: Updated hosts count
@@ -65,20 +64,11 @@ spec:
       description: Added hosts count
       priority: 1 # show in wide view
       JSONPath: .status.hostsAdded
-    - name: hosts-completed
-      type: integer
-      description: Completed hosts count
-      JSONPath: .status.hostsCompleted
     - name: hosts-deleted
       type: integer
       description: Hosts deleted count
       priority: 1 # show in wide view
       JSONPath: .status.hostsDeleted
-    - name: hosts-delete
-      type: integer
-      description: Hosts to be deleted count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsDelete
     - name: endpoint
       type: string
       description: Client access endpoint
@@ -1332,11 +1322,10 @@ spec:
       type: string
       description: Resource status
       JSONPath: .status.status
-    - name: hosts-unchanged
+    - name: hosts-completed
       type: integer
-      description: Unchanged hosts count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsUnchanged
+      description: Completed hosts count
+      JSONPath: .status.hostsCompleted
     - name: hosts-updated
       type: integer
       description: Updated hosts count
@@ -1347,20 +1336,11 @@ spec:
       description: Added hosts count
       priority: 1 # show in wide view
       JSONPath: .status.hostsAdded
-    - name: hosts-completed
-      type: integer
-      description: Completed hosts count
-      JSONPath: .status.hostsCompleted
     - name: hosts-deleted
       type: integer
       description: Hosts deleted count
       priority: 1 # show in wide view
       JSONPath: .status.hostsDeleted
-    - name: hosts-delete
-      type: integer
-      description: Hosts to be deleted count
-      priority: 1 # show in wide view
-      JSONPath: .status.hostsDelete
     - name: endpoint
       type: string
       description: Client access endpoint
@@ -3869,7 +3849,6 @@ metadata:
   namespace: ${OPERATOR_NAMESPACE}
   labels:
     clickhouse.altinity.com/chop: 0.24.3
-
 # Template Parameters:
 #
 # NAMESPACE=${OPERATOR_NAMESPACE}