remove map fields from BaseComponentSpec

Author: pgier

operator/src/main/java/com/datastax/oss/kaap/crds/BaseComponentSpec.java

@@ -46,8 +46,6 @@ public abstract class BaseComponentSpec<T> extends ValidableSpec<T> implements W
     protected String image;
     @JsonPropertyDescription(CRDConstants.DOC_IMAGE_PULL_POLICY)
     private String imagePullPolicy;
-    @JsonPropertyDescription(CRDConstants.DOC_NODE_SELECTORS)
-    protected Map<String, String> nodeSelectors;
     @JsonPropertyDescription(CRDConstants.DOC_REPLICAS)
     protected Integer replicas;
     @JsonPropertyDescription("Pod disruption budget configuration.")
@@ -60,16 +58,6 @@ public abstract class BaseComponentSpec<T> extends ValidableSpec<T> implements W
     private NodeAffinity nodeAffinity;
     @JsonPropertyDescription(CRDConstants.DOC_ANTIAFFINITY)
     private AntiAffinityConfig antiAffinity;
-    @JsonPropertyDescription(CRDConstants.DOC_ANNOTATIONS)
-    private Map<String, String> annotations;
-    @JsonPropertyDescription(CRDConstants.DOC_POD_ANNOTATIONS)
-    private Map<String, String> podAnnotations;
-    @JsonPropertyDescription(CRDConstants.DOC_LABELS)
-    private Map<String, String> labels;
-    @JsonPropertyDescription(CRDConstants.DOC_POD_LABELS)
-    private Map<String, String> podLabels;
-    @JsonPropertyDescription(CRDConstants.DOC_POD_MATCH_LABELS)
-    private Map<String, String> matchLabels;
     @JsonPropertyDescription(CRDConstants.DOC_IMAGE_PULL_SECRETS)
     private List<LocalObjectReference> imagePullSecrets;
     @JsonPropertyDescription(CRDConstants.DOC_CONTAINER_ENV)
@@ -88,7 +76,6 @@ public void applyDefaults(GlobalSpec globalSpec) {
         if (image == null) {
             image = globalSpec.getImage();
         }
-        nodeSelectors = ConfigUtil.mergeMaps(globalSpec.getNodeSelectors(), nodeSelectors);
         if (imagePullPolicy == null) {
             imagePullPolicy = globalSpec.getImagePullPolicy();
         }

operator/src/main/java/com/datastax/oss/kaap/crds/bookkeeper/BookKeeperSetSpec.java

@@ -172,6 +172,7 @@ public static class ServiceConfig {
     @Override
     public void applyDefaults(GlobalSpec globalSpec) {
         super.applyDefaults(globalSpec);
+        nodeSelectors = ConfigUtil.mergeMaps(globalSpec.getNodeSelectors(), nodeSelectors);
         super.applyFsGroup0IfSecurityContextMissing();
         if (replicas == null) {
             replicas = 3;

operator/src/main/java/com/datastax/oss/kaap/crds/broker/BrokerSetSpec.java

@@ -215,6 +215,7 @@ public static class TransactionCoordinatorInitJobConfig {
     @Override
     public void applyDefaults(GlobalSpec globalSpec) {
         super.applyDefaults(globalSpec);
+        nodeSelectors = ConfigUtil.mergeMaps(globalSpec.getNodeSelectors(), nodeSelectors);
 
         if (gracePeriod == null) {
             gracePeriod = 60;

operator/src/main/java/com/datastax/oss/kaap/crds/function/FunctionsWorkerSpec.java

@@ -156,6 +156,7 @@ public static class ServiceConfig {
     @Override
     public void applyDefaults(GlobalSpec globalSpec) {
         super.applyDefaults(globalSpec);
+        nodeSelectors = ConfigUtil.mergeMaps(globalSpec.getNodeSelectors(), nodeSelectors);
         super.applyFsGroup0IfSecurityContextMissing();
 
         if (replicas == null) {

operator/src/main/java/com/datastax/oss/kaap/crds/proxy/ProxySetSpec.java

@@ -181,6 +181,7 @@ public static class WebSocketConfig {
     @Override
     public void applyDefaults(GlobalSpec globalSpec) {
         super.applyDefaults(globalSpec);
+        nodeSelectors = ConfigUtil.mergeMaps(globalSpec.getNodeSelectors(), nodeSelectors);
         if (replicas == null) {
             replicas = 3;
         }

operator/src/main/java/com/datastax/oss/kaap/crds/zookeeper/ZooKeeperSpec.java

@@ -149,6 +149,7 @@ public static class MetadataInitializationJobConfig {
     @Override
     public void applyDefaults(GlobalSpec globalSpec) {
         super.applyDefaults(globalSpec);
+        nodeSelectors = ConfigUtil.mergeMaps(globalSpec.getNodeSelectors(), nodeSelectors);
         super.applyFsGroup0IfSecurityContextMissing();
         if (podManagementPolicy == null) {
             podManagementPolicy = "Parallel";