add affinity to templates

Jeff McCormick · Jeff McCormick · commit 7f5aa6d5cf82 · 2017-08-08T20:11:07.000-05:00
diff --git a/client/cmd/cluster.go b/client/cmd/cluster.go
@@ -135,7 +135,7 @@ func listPods(name string) {
 		return
 	}
 	for _, pod := range pods.Items {
-		fmt.Println(TREE_BRANCH + "pod : " + pod.ObjectMeta.Name + " (" + string(pod.Status.Phase) + ") (" + getReadyStatus(&pod) + ")")
+		fmt.Println(TREE_BRANCH + "pod : " + pod.ObjectMeta.Name + " (" + string(pod.Status.Phase) + " on " + pod.Spec.NodeName + ") (" + getReadyStatus(&pod) + ")")
 		//fmt.Println(TREE_TRUNK + " phase : " + pod.Status.Phase)
 	}
 
diff --git a/conf/postgres-operator/cluster/1/cluster-deployment-1.json b/conf/postgres-operator/cluster/1/cluster-deployment-1.json
@@ -103,9 +103,24 @@
                         }
                     }
 
-
                 ],
 
+		"affinity": {
+			"nodeAffinity": {
+			"requiredDuringSchedulingIgnoredDuringExecution": {
+				"nodeSelectorTerms": [{
+				"matchExpressions": [{
+					"key": "kubernetes.io/hostname",
+					"operator": "In",
+					"values": [
+						"{{.NODE_SELECTOR}}"
+					]
+				}]
+				}]
+			}
+			}
+		},  
+
                 "restartPolicy": "Always",
                 "dnsPolicy": "ClusterFirst"
             }
diff --git a/conf/postgres-operator/cluster/1/cluster-replica-deployment-1-shared.json b/conf/postgres-operator/cluster/1/cluster-replica-deployment-1-shared.json
@@ -83,6 +83,22 @@
 		}
 		],
 
+		"affinity": {
+		    "nodeAffinity": {
+			"preferredDuringSchedulingIgnoredDuringExecution": [{
+			    "weight": 1,
+			    "preference": {
+				"matchExpressions": [{
+				    "key": "kubernetes.io/hostname",
+				    "operator": "NotIn",
+				    "values": [
+					"{{.NODE_SELECTOR}}"
+				    ]   
+				}]  
+			    }   
+			}]  
+		    }   
+		}, 
                 "restartPolicy": "Always",
                 "dnsPolicy": "ClusterFirst"
             }
diff --git a/conf/postgres-operator/cluster/1/cluster-replica-deployment-1.json b/conf/postgres-operator/cluster/1/cluster-replica-deployment-1.json
@@ -81,6 +81,23 @@
 		}
 		],
 
+               "affinity": {
+                    "nodeAffinity": {
+                        "preferredDuringSchedulingIgnoredDuringExecution": [{
+                            "weight": 1,
+                            "preference": {
+                                "matchExpressions": [{
+                                    "key": "kubernetes.io/hostname",
+                                    "operator": "NotIn",
+                                    "values": [
+                                        "{{.NODE_SELECTOR}}"
+                                    ]
+                                }]
+                            }
+                        }]
+                    }
+                },
+
                 "restartPolicy": "Always",
                 "dnsPolicy": "ClusterFirst"
             }
diff --git a/operator/cluster/cluster.go b/operator/cluster/cluster.go
@@ -68,6 +68,7 @@ type DeploymentTemplateFields struct {
 	PGUSER_SECRET_NAME   string
 	PGMASTER_SECRET_NAME string
 	SECURITY_CONTEXT     string
+	NODE_SELECTOR        string
 	//next 2 are for the replica deployment only
 	REPLICAS       string
 	PG_MASTER_HOST string
diff --git a/operator/cluster/cluster_strategy_1.go b/operator/cluster/cluster_strategy_1.go
@@ -93,6 +93,7 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 		PGROOT_SECRET_NAME:   cl.Spec.PGROOT_SECRET_NAME,
 		PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
 		PGUSER_SECRET_NAME:   cl.Spec.PGUSER_SECRET_NAME,
+		NODE_SELECTOR:        "operator",
 	}
 
 	err = DeploymentTemplate1.Execute(&masterDoc, deploymentFields)
@@ -426,6 +427,7 @@ func (r ClusterStrategy1) CreateReplica(serviceName string, clientset *kubernete
 		PGROOT_SECRET_NAME:   cl.Spec.PGROOT_SECRET_NAME,
 		PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
 		PGUSER_SECRET_NAME:   cl.Spec.PGUSER_SECRET_NAME,
+		NODE_SELECTOR:        "operator",
 	}
 
 	switch cl.Spec.ReplicaStorage.StorageType {

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func listPods(name string) {`
`135`	`135`	`return`
`136`	`136`	`}`
`137`	`137`	`for _, pod := range pods.Items {`
`138`		`- fmt.Println(TREE_BRANCH + "pod : " + pod.ObjectMeta.Name + " (" + string(pod.Status.Phase) + ") (" + getReadyStatus(&pod) + ")")`
	`138`	`+ fmt.Println(TREE_BRANCH + "pod : " + pod.ObjectMeta.Name + " (" + string(pod.Status.Phase) + " on " + pod.Spec.NodeName + ") (" + getReadyStatus(&pod) + ")")`
`139`	`139`	`//fmt.Println(TREE_TRUNK + " phase : " + pod.Status.Phase)`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ func (r ClusterStrategy1) AddCluster(clientset kubernetes.Clientset, client re`
`93`	`93`	`PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,`
`94`	`94`	`PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,`
`95`	`95`	`PGUSER_SECRET_NAME: cl.Spec.PGUSER_SECRET_NAME,`
	`96`	`+ NODE_SELECTOR: "operator",`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`err = DeploymentTemplate1.Execute(&masterDoc, deploymentFields)`
`@@ -426,6 +427,7 @@ func (r ClusterStrategy1) CreateReplica(serviceName string, clientset *kubernete`
`426`	`427`	`PGROOT_SECRET_NAME: cl.Spec.PGROOT_SECRET_NAME,`
`427`	`428`	`PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,`
`428`	`429`	`PGUSER_SECRET_NAME: cl.Spec.PGUSER_SECRET_NAME,`
	`430`	`+ NODE_SELECTOR: "operator",`
`429`	`431`	`}`
`430`	`432`
`431`	`433`	`switch cl.Spec.ReplicaStorage.StorageType {`