feat: add affinity and tolerations to zone topology

oceanbase · Oct 24, 2023 · 6e5cf25 · 6e5cf25
1 parent 09ba7aa
commit 6e5cf25
Show file tree

Hide file tree

Showing 8 changed files with 2,741 additions and 10 deletions.
diff --git a/api/v1alpha1/observer_types.go b/api/v1alpha1/observer_types.go
@@ -29,13 +29,15 @@ type OBServerSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	ClusterName      string            `json:"clusterName"`
-	ClusterId        int64             `json:"clusterId,omitempty"`
-	Zone             string            `json:"zone"`
-	NodeSelector     map[string]string `json:"nodeSelector,omitempty"`
-	OBServerTemplate *OBServerTemplate `json:"observerTemplate"`
-	MonitorTemplate  *MonitorTemplate  `json:"monitorTemplate,omitempty"`
-	BackupVolume     *BackupVolumeSpec `json:"backupVolume,omitempty"`
+	ClusterName      string              `json:"clusterName"`
+	ClusterId        int64               `json:"clusterId,omitempty"`
+	Zone             string              `json:"zone"`
+	NodeSelector     map[string]string   `json:"nodeSelector,omitempty"`
+	Affinity         *corev1.Affinity    `json:"affinity,omitempty"`
+	Tolerations      []corev1.Toleration `json:"tolerations,omitempty"`
+	OBServerTemplate *OBServerTemplate   `json:"observerTemplate"`
+	MonitorTemplate  *MonitorTemplate    `json:"monitorTemplate,omitempty"`
+	BackupVolume     *BackupVolumeSpec   `json:"backupVolume,omitempty"`
 }
 
 // OBServerStatus defines the observed state of OBServer

diff --git a/api/v1alpha1/obzone_topology.go b/api/v1alpha1/obzone_topology.go
@@ -12,8 +12,12 @@ See the Mulan PSL v2 for more details.
 
 package v1alpha1
 
+import corev1 "k8s.io/api/core/v1"
+
 type OBZoneTopology struct {
-	Zone         string            `json:"zone"`
-	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
-	Replica      int               `json:"replica"`
+	Zone         string              `json:"zone"`
+	NodeSelector map[string]string   `json:"nodeSelector,omitempty"`
+	Affinity     *corev1.Affinity    `json:"affinity,omitempty"`
+	Tolerations  []corev1.Toleration `json:"tolerations,omitempty"`
+	Replica      int                 `json:"replica"`
 }
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/oceanbase.oceanbase.com_obclusters.yaml b/config/crd/bases/oceanbase.oceanbase.com_obclusters.yaml
diff --git a/config/crd/bases/oceanbase.oceanbase.com_observers.yaml b/config/crd/bases/oceanbase.oceanbase.com_observers.yaml
diff --git a/config/crd/bases/oceanbase.oceanbase.com_obzones.yaml b/config/crd/bases/oceanbase.oceanbase.com_obzones.yaml
diff --git a/pkg/resource/observer_task.go b/pkg/resource/observer_task.go
@@ -257,6 +257,8 @@ func (m *OBServerManager) createOBPodSpec(obcluster *v1alpha1.OBCluster) corev1.
 		Volumes:      volumes,
 		Containers:   containers,
 		NodeSelector: m.OBServer.Spec.NodeSelector,
+		Affinity:     m.OBServer.Spec.Affinity,
+		Tolerations:  m.OBServer.Spec.Tolerations,
 	}
 	return podSpec
 }

diff --git a/pkg/resource/obzone_task.go b/pkg/resource/obzone_task.go
@@ -125,6 +125,8 @@ func (m *OBZoneManager) CreateOBServer() error {
 				ClusterId:        m.OBZone.Spec.ClusterId,
 				Zone:             m.OBZone.Spec.Topology.Zone,
 				NodeSelector:     m.OBZone.Spec.Topology.NodeSelector,
+				Affinity:         m.OBZone.Spec.Topology.Affinity,
+				Tolerations:      m.OBZone.Spec.Topology.Tolerations,
 				OBServerTemplate: m.OBZone.Spec.OBServerTemplate,
 				MonitorTemplate:  m.OBZone.Spec.MonitorTemplate,
 				BackupVolume:     m.OBZone.Spec.BackupVolume,