fix: region mover merging oversight (#626)

Author: razvan

deploy/helm/hbase-operator/crds/crds.yaml

@@ -688,9 +688,6 @@ spec:
                           description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
                           nullable: true
                           type: string
-                        hbaseOpts:
-                          nullable: true
-                          type: string
                         hbaseRootdir:
                           nullable: true
                           type: string
@@ -969,9 +966,6 @@ spec:
                                 description: Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
                                 nullable: true
                                 type: string
-                              hbaseOpts:
-                                nullable: true
-                                type: string
                               hbaseRootdir:
                                 nullable: true
                                 type: string

rust/crd/src/lib.rs

@@ -424,7 +424,6 @@ impl AnyConfigFragment {
             HbaseRole::RegionServer => {
                 AnyConfigFragment::RegionServer(RegionServerConfigFragment {
                     hbase_rootdir: None,
-                    hbase_opts: None,
                     resources: default_resources(role),
                     logging: product_logging::spec::default_logging(),
                     affinity: get_affinity(cluster_name, role, hdfs_discovery_cm_name),
@@ -666,8 +665,6 @@ impl Atomic for RegionMoverExtraCliOpts {}
 pub struct RegionServerConfig {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub hbase_rootdir: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub hbase_opts: Option<String>,
     #[fragment_attrs(serde(default))]
     pub resources: Resources<HbaseStorageConfig, NoRuntimeLimits>,
     #[fragment_attrs(serde(default))]

rust/operator-binary/src/config/jvm.rs

@@ -46,7 +46,8 @@ pub fn construct_global_jvm_args(kerberos_enabled: bool) -> String {
     jvm_args.join(" ")
 }
 
-/// Arguments that go into `HBASE_OPTS`, so *not* the heap settings (which go into `HBASE_HEAPSIZE`).
+/// JVM arguments that are specifically for the role (server), so will *not* be used e.g. by CLI tools.
+/// Heap settings are excluded, as they go into `HBASE_HEAPSIZE`.
 pub fn construct_role_specific_non_heap_jvm_args(
     hbase: &HbaseCluster,
     hbase_role: &HbaseRole,