address review comments

Author: ashishch432

api/v1alpha1/keepercluster_types.go

@@ -58,6 +58,18 @@ type KeeperClusterSpec struct {
 	// +optional
 	// +kubebuilder:default:="cluster.local"
 	ClusterDomain string `json:"clusterDomain,omitempty"`
+
+	// UpgradeChannel specifies the release channel for major version upgrade checks.
+	// When empty, only minor updates will be proposed. Allowed values are: stable, lts or specific major.minor version (e.g. 25.8).
+	// +optional
+	// +kubebuilder:validation:Pattern=`^(lts|stable|\d+\.\d+)?$`
+	UpgradeChannel string `json:"upgradeChannel,omitempty"`
+
+	// VersionProbeTemplate overrides for the version detection Job.
+	//
+	// Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
+	// +optional
+	VersionProbeTemplate *VersionProbeTemplate `json:"versionProbeTemplate,omitempty"`
 }
 
 // WithDefaults sets default values for KeeperClusterSpec fields.
@@ -151,6 +163,16 @@ type KeeperClusterStatus struct {
 	// ObservedGeneration indicates latest generation observed by controller.
 	// +operator-sdk:csv:customresourcedefinitions:type=status
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+	// Version indicates the version reported by the Keeper server.
+	// +optional
+	// +operator-sdk:csv:customresourcedefinitions:type=status
+	Version string `json:"version,omitempty"`
+	// VersionProbeRevision is the image hash of the last successful version probe.
+	//
+	// Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
+	// +optional
+	// +operator-sdk:csv:customresourcedefinitions:type=status
+	VersionProbeRevision string `json:"versionProbeRevision,omitempty"`
 }
 
 // KeeperCluster is the Schema for the `keeperclusters` API.
@@ -161,6 +183,7 @@ type KeeperClusterStatus struct {
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message"
 // +kubebuilder:printcolumn:name="ReadyReplicas",type="number",JSONPath=".status.readyReplicas"
 // +kubebuilder:printcolumn:name="Replicas",type="number",JSONPath=".spec.replicas"
+// +kubebuilder:printcolumn:name="Version",type="string",JSONPath=".status.version"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +operator-sdk:csv:customresourcedefinitions:resources={{Pod,v1}}
 // +operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1}}

api/v1alpha1/zz_generated.deepcopy.go

@@ -201,7 +201,7 @@ func run() error {
 		upgradeChecker = upgrade.NewChecker(updater)
 	}
 
-	if err = keeper.SetupWithManager(mgr, zapLogger, nil, env.EnablePDB); err != nil {
+	if err = keeper.SetupWithManager(mgr, zapLogger, upgradeChecker, nil, env.EnablePDB); err != nil {
 		return fmt.Errorf("unable to setup KeeperCluster controller: %w", err)
 	}
 

cmd/main.go

@@ -87,7 +87,8 @@ spec:
         displayName: Version Probe Revision
         path: versionProbeRevision
       version: v1alpha1
-    - displayName: Keeper Cluster
+    - description: KeeperCluster is the Schema for the `keeperclusters` API.
+      displayName: Keeper Cluster
       kind: KeeperCluster
       name: keeperclusters.clickhouse.com
       resources:
@@ -140,6 +141,14 @@ spec:
           revision.
         displayName: Update Revision
         path: updateRevision
+      - description: Version indicates the version reported by the Keeper server.
+        displayName: Version
+        path: version
+      - description: |-
+          VersionProbeRevision is the image hash of the last successful version probe.
+          Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
+        displayName: Version Probe Revision
+        path: versionProbeRevision
       version: v1alpha1
   description: |
     The ClickHouse Operator is a Kubernetes operator that automates the deployment, configuration, and management of ClickHouse clusters and ClickHouse Keeper clusters on Kubernetes.

config/crd/bases/clickhouse.com_keeperclusters.yaml

@@ -151,3 +151,12 @@ keeper:
     # Configuration parameters for ClickHouse Keeper server.
     # settings: {}
 
+    # UpgradeChannel specifies the release channel for major version upgrade checks.
+    # When empty, only minor updates will be proposed. Allowed values are: stable, lts or specific major.minor version (e.g. 25.8).
+    # upgradeChannel: ""
+
+    # VersionProbeTemplate overrides for the version detection Job.
+    #
+    # Deprecated: Keeper version probe Jobs are not used; this field is retained for backward compatibility.
+    # versionProbeTemplate: {}
+