Merge pull request #238 from zzzhangqi/main

fix: del pod antiaffininty
goodrain · Apr 28, 2024 · cebc4bb · cebc4bb
2 parents beac613 + 85c2c4e
commit cebc4bb
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/controllers/handler/api.go b/controllers/handler/api.go
@@ -239,7 +239,7 @@ func (a *api) deployment() client.Object {
 				Spec: corev1.PodSpec{
 					ImagePullSecrets:              imagePullSecrets(a.component, a.cluster),
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
-					Affinity:                      antiAffinityForRequiredNodes([]string{APIName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{APIName}),
 					Containers: []corev1.Container{
 						{
 							Name:            APIName,

diff --git a/controllers/handler/app-ui.go b/controllers/handler/app-ui.go
@@ -244,7 +244,7 @@ func (a *appui) deploymentForAppUI() client.Object {
 				Spec: corev1.PodSpec{
 					ImagePullSecrets:              imagePullSecrets(a.component, a.cluster),
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
-					Affinity:                      antiAffinityForRequiredNodes([]string{AppUIName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{AppUIName}),
 					Containers: []corev1.Container{
 						{
 							Name:            AppUIName,

diff --git a/controllers/handler/common.go b/controllers/handler/common.go
@@ -370,7 +370,7 @@ func antiAffinityForRequiredNodes(componentLabelName []string) *corev1.Affinity
 								},
 							},
 						},
-						TopologyKey: "kubernetes.io/hostname,k3s.io/hostname",
+						TopologyKey: "kubernetes.io/hostname",
 					},
 				},
 			},

diff --git a/controllers/handler/hub.go b/controllers/handler/hub.go
@@ -182,7 +182,7 @@ func (h *hub) deployment() client.Object {
 				Spec: corev1.PodSpec{
 					ImagePullSecrets:              imagePullSecrets(h.component, h.cluster),
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
-					Affinity:                      antiAffinityForRequiredNodes([]string{HubName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{HubName}),
 					Containers: []corev1.Container{
 						{
 							Name:            "rbd-hub",

diff --git a/controllers/handler/mq.go b/controllers/handler/mq.go
@@ -112,7 +112,7 @@ func (m *mq) deployment() client.Object {
 				Spec: corev1.PodSpec{
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
 					ImagePullSecrets:              imagePullSecrets(m.component, m.cluster),
-					Affinity:                      antiAffinityForRequiredNodes([]string{MQName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{MQName}),
 					Containers: []corev1.Container{
 						{
 							Name:            MQName,

diff --git a/controllers/handler/resource_proxy.go b/controllers/handler/resource_proxy.go
@@ -110,7 +110,7 @@ func (r *resourceProxy) resource() []client.Object {
 				Spec: corev1.PodSpec{
 					ImagePullSecrets:              imagePullSecrets(r.component, r.cluster),
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
-					Affinity:                      antiAffinityForRequiredNodes([]string{ResourceProxyName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{ResourceProxyName}),
 					Containers: []corev1.Container{
 						{
 							Name:            ResourceProxyName,

diff --git a/controllers/handler/webcli.go b/controllers/handler/webcli.go
@@ -104,7 +104,7 @@ func (w *webcli) deployment() client.Object {
 					ImagePullSecrets:              imagePullSecrets(w.component, w.cluster),
 					ServiceAccountName:            "rainbond-operator",
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
-					Affinity:                      antiAffinityForRequiredNodes([]string{WebCliName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{WebCliName}),
 					Containers: []corev1.Container{
 						{
 							Name:            WebCliName,

diff --git a/controllers/handler/worker.go b/controllers/handler/worker.go
@@ -225,7 +225,7 @@ func (w *worker) deployment() client.Object {
 					TerminationGracePeriodSeconds: commonutil.Int64(0),
 					ServiceAccountName:            "rainbond-operator",
 					ImagePullSecrets:              imagePullSecrets(w.component, w.cluster),
-					Affinity:                      antiAffinityForRequiredNodes([]string{WorkerName}),
+					// Affinity:                      antiAffinityForRequiredNodes([]string{WorkerName}),
 					Containers: []corev1.Container{
 						{
 							Name:            WorkerName,
-Original file line number
+Diff line change
@@ Expand Up @@
     								},
     							},
     						},
-    						TopologyKey: "kubernetes.io/hostname,k3s.io/hostname",
+    						TopologyKey: "kubernetes.io/hostname",
     					},
     				},
     			},
@@ Expand Down @@