Skip to content

Commit c889bdd

Browse files
author
Jeff McCormick
committed
remove affinity as the default
1 parent 7695ec1 commit c889bdd

8 files changed

+385
-48
lines changed

‎client/cmd/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pgo create cluster mycluster`,
7272

7373
//always have a valid NodeName
7474
if NodeName == "" {
75-
NodeName = getValidNodeName()
75+
//NodeName = getValidNodeName()
7676
} else {
7777
err = validateNodeName(NodeName)
7878
if err != nil {

‎conf/postgres-operator/cluster/1/affinity.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"affinity": {
2+
"nodeAffinity": {
3+
"preferredDuringSchedulingIgnoredDuringExecution": {
4+
"nodeSelectorTerms": [{
5+
"matchExpressions": [{
6+
"key": "kubernetes.io/hostname",
7+
"operator": "{{.OPERATOR}}",
8+
"values": [
9+
"{{.NODE}}"
10+
]
11+
}]
12+
}]
13+
}
14+
}
15+
},
16+

‎conf/postgres-operator/cluster/1/cluster-deployment-1-affinity.json‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
{
2+
"kind": "Deployment",
3+
"apiVersion": "extensions/v1beta1",
4+
"metadata": {
5+
"name": "{{.Name}}",
6+
"labels": {
7+
{{.OPERATOR_LABELS }}
8+
}
9+
},
10+
"spec": {
11+
"replicas": 1,
12+
"template": {
13+
"metadata": {
14+
"labels": {
15+
"name": "{{.Name}}",
16+
"master": "true",
17+
"pg-cluster": "{{.ClusterName}}"
18+
}
19+
},
20+
"spec": {
21+
22+
{{.SECURITY_CONTEXT }}
23+
24+
"containers": [{
25+
"name": "database",
26+
"image": "crunchydata/crunchy-postgres:{{.CCP_IMAGE_TAG}}",
27+
"readinessProbe": {
28+
"exec": {
29+
"command": [
30+
"/opt/cpm/bin/readiness.sh"
31+
]
32+
},
33+
"initialDelaySeconds": 15,
34+
"timeoutSeconds": 8
35+
},
36+
"env": [{
37+
"name": "PG_MASTER_PORT",
38+
"value": "{{.Port}}"
39+
}, {
40+
"name": "PG_MODE",
41+
"value": "master"
42+
}, {
43+
"name": "PGDATA_PATH_OVERRIDE",
44+
"value": "{{.PGDATA_PATH_OVERRIDE}}"
45+
}, {
46+
"name": "BACKUP_PATH",
47+
"value": "{{.BACKUP_PATH}}"
48+
}, {
49+
"name": "PG_DATABASE",
50+
"value": "{{.PG_DATABASE}}"
51+
}, {
52+
"name": "PGHOST",
53+
"value": "/tmp"
54+
}],
55+
"volumeMounts": [{
56+
"mountPath": "/pgdata",
57+
"name": "pgdata",
58+
"readOnly": false
59+
}, {
60+
"mountPath": "/backup",
61+
"name": "backup",
62+
"readOnly": true
63+
}, {
64+
"mountPath": "/pguser",
65+
"name": "pguser-volume"
66+
}, {
67+
"mountPath": "/pgmaster",
68+
"name": "pgmaster-volume"
69+
}, {
70+
"mountPath": "/pgroot",
71+
"name": "pgroot-volume"
72+
}
73+
74+
],
75+
76+
"ports": [{
77+
"containerPort": 5432,
78+
"protocol": "TCP"
79+
}],
80+
"resources": {},
81+
"imagePullPolicy": "IfNotPresent"
82+
}],
83+
"volumes": [{
84+
"name": "pgdata",
85+
{{.PVC_NAME}}
86+
}, {
87+
"name": "backup",
88+
{{.BACKUP_PVC_NAME}}
89+
}, {
90+
"name": "pguser-volume",
91+
"secret": {
92+
"secretName": "{{.PGUSER_SECRET_NAME}}"
93+
}
94+
}, {
95+
"name": "pgmaster-volume",
96+
"secret": {
97+
"secretName": "{{.PGMASTER_SECRET_NAME}}"
98+
}
99+
}, {
100+
"name": "pgroot-volume",
101+
"secret": {
102+
"secretName": "{{.PGROOT_SECRET_NAME}}"
103+
}
104+
}
105+
106+
],
107+
108+
"affinity": {
109+
"nodeAffinity": {
110+
"preferredDuringSchedulingIgnoredDuringExecution": {
111+
"nodeSelectorTerms": [{
112+
"matchExpressions": [{
113+
"key": "kubernetes.io/hostname",
114+
"operator": "In",
115+
"values": [
116+
"{{.NODE_SELECTOR}}"
117+
]
118+
}]
119+
}]
120+
}
121+
}
122+
},
123+
124+
"restartPolicy": "Always",
125+
"dnsPolicy": "ClusterFirst"
126+
}
127+
},
128+
"strategy": {
129+
"type": "RollingUpdate",
130+
"rollingUpdate": {
131+
"maxUnavailable": 1,
132+
"maxSurge": 1
133+
}
134+
}
135+
}
136+
}

‎conf/postgres-operator/cluster/1/cluster-deployment-1.json‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,7 @@
105105

106106
],
107107

108-
"affinity": {
109-
"nodeAffinity": {
110-
"requiredDuringSchedulingIgnoredDuringExecution": {
111-
"nodeSelectorTerms": [{
112-
"matchExpressions": [{
113-
"key": "kubernetes.io/hostname",
114-
"operator": "In",
115-
"values": [
116-
"{{.NODE_SELECTOR}}"
117-
]
118-
}]
119-
}]
120-
}
121-
}
122-
},
108+
{{.NODE_SELECTOR}}
123109

124110
"restartPolicy": "Always",
125111
"dnsPolicy": "ClusterFirst"

‎conf/postgres-operator/cluster/1/cluster-replica-deployment-1-affinity.json‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
"kind": "Deployment",
3+
"apiVersion": "extensions/v1beta1",
4+
"metadata": {
5+
"name": "{{.Name}}"
6+
},
7+
"spec": {
8+
"replicas": {{.REPLICAS}},
9+
"template": {
10+
"metadata": {
11+
"labels": {
12+
{{.OPERATOR_LABELS}}
13+
}
14+
},
15+
"spec": {
16+
17+
{{.SECURITY_CONTEXT}}
18+
19+
"containers": [{
20+
"name": "database",
21+
"image": "crunchydata/crunchy-postgres:{{.CCP_IMAGE_TAG}}",
22+
"env": [{
23+
"name": "PG_MASTER_PORT",
24+
"value": "{{.Port}}"
25+
}, {
26+
"name": "PG_MASTER_HOST",
27+
"value": "{{.PG_MASTER_HOST}}"
28+
}, {
29+
"name": "PG_MODE",
30+
"value": "slave"
31+
}, {
32+
"name": "PG_DATABASE",
33+
"value": "{{.PG_DATABASE}}"
34+
}, {
35+
"name": "PGHOST",
36+
"value": "/tmp"
37+
}],
38+
"volumeMounts": [
39+
{
40+
"mountPath": "/pgdata",
41+
"name": "pgdata",
42+
"readOnly": false
43+
}, {
44+
"mountPath": "/pguser",
45+
"name": "pguser-volume"
46+
}, {
47+
"mountPath": "/pgmaster",
48+
"name": "pgmaster-volume"
49+
}, {
50+
"mountPath": "/pgroot",
51+
"name": "pgroot-volume"
52+
}
53+
],
54+
55+
"ports": [{
56+
"containerPort": 5432,
57+
"protocol": "TCP"
58+
}],
59+
"resources": {},
60+
"imagePullPolicy": "IfNotPresent"
61+
}],
62+
"volumes": [
63+
{
64+
"name": "pgdata",
65+
"emptyDir": {}
66+
}, {
67+
"name": "pguser-volume",
68+
"secret": {
69+
"secretName": "{{.PGUSER_SECRET_NAME}}"
70+
}
71+
}, {
72+
"name": "pgmaster-volume",
73+
"secret": {
74+
"secretName": "{{.PGMASTER_SECRET_NAME}}"
75+
}
76+
}, {
77+
"name": "pgroot-volume",
78+
"secret": {
79+
"secretName": "{{.PGROOT_SECRET_NAME}}"
80+
}
81+
}
82+
],
83+
84+
"affinity": {
85+
"nodeAffinity": {
86+
"preferredDuringSchedulingIgnoredDuringExecution": [{
87+
"weight": 1,
88+
"preference": {
89+
"matchExpressions": [{
90+
"key": "kubernetes.io/hostname",
91+
"operator": "NotIn",
92+
"values": [
93+
"{{.NODE_SELECTOR}}"
94+
]
95+
}]
96+
}
97+
}]
98+
}
99+
},
100+
101+
"restartPolicy": "Always",
102+
"dnsPolicy": "ClusterFirst"
103+
}
104+
},
105+
"strategy": {
106+
"type": "RollingUpdate",
107+
"rollingUpdate": {
108+
"maxUnavailable": 1,
109+
"maxSurge": 1
110+
}
111+
}
112+
}
113+
}

0 commit comments

Comments
 (0)