From 8bf7a453c9d12cba42435b2261aea278aa2b63ff Mon Sep 17 00:00:00 2001
From: Daman Arora <daman.arora@shapeblue.com>
Date: Tue, 6 Jan 2026 11:04:48 -0500
Subject: [PATCH] Add affinity group ID fields and accessors to
 KubernetesCluster and KubernetesClusterVO

---
 .../kubernetes/cluster/KubernetesCluster.java |  3 ++
 .../cluster/KubernetesClusterVO.java          | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/api/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java b/api/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java
index ce905b293ff..4426fe01165 100644
--- a/api/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java
+++ b/api/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java
@@ -170,6 +170,9 @@ public interface KubernetesCluster extends ControlledEntity, com.cloud.utils.fsm
     Long getWorkerNodeTemplateId();
     Long getEtcdNodeTemplateId();
     Long getEtcdNodeCount();
+    Long getControlNodeAffinityGroupId();
+    Long getWorkerNodeAffinityGroupId();
+    Long getEtcdNodeAffinityGroupId();
     Long getCniConfigId();
     String getCniConfigDetails();
     boolean isCsiEnabled();
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java
index 7dfd0043e32..6d28dd7d2e5 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java
@@ -139,6 +139,15 @@ public class KubernetesClusterVO implements KubernetesCluster {
     @Column(name = "etcd_node_template_id")
     private Long etcdNodeTemplateId;
 
+    @Column(name = "control_node_affinity_group_id")
+    private Long controlNodeAffinityGroupId;
+
+    @Column(name = "worker_node_affinity_group_id")
+    private Long workerNodeAffinityGroupId;
+
+    @Column(name = "etcd_node_affinity_group_id")
+    private Long etcdNodeAffinityGroupId;
+
     @Column(name = "cni_config_id", nullable = true)
     private Long cniConfigId = null;
 
@@ -509,6 +518,30 @@ public class KubernetesClusterVO implements KubernetesCluster {
         this.controlNodeTemplateId = controlNodeTemplateId;
     }
 
+    public Long getControlNodeAffinityGroupId() {
+        return controlNodeAffinityGroupId;
+    }
+
+    public void setControlNodeAffinityGroupId(Long controlNodeAffinityGroupId) {
+        this.controlNodeAffinityGroupId = controlNodeAffinityGroupId;
+    }
+
+    public Long getWorkerNodeAffinityGroupId() {
+        return workerNodeAffinityGroupId;
+    }
+
+    public void setWorkerNodeAffinityGroupId(Long workerNodeAffinityGroupId) {
+        this.workerNodeAffinityGroupId = workerNodeAffinityGroupId;
+    }
+
+    public Long getEtcdNodeAffinityGroupId() {
+        return etcdNodeAffinityGroupId;
+    }
+
+    public void setEtcdNodeAffinityGroupId(Long etcdNodeAffinityGroupId) {
+        this.etcdNodeAffinityGroupId = etcdNodeAffinityGroupId;
+    }
+
     public Long getCniConfigId() {
         return cniConfigId;
     }