简柏林 / thingskit · Commits

Commit 2b18ed7a9294d72ecfcf24534dc2b70cb8592fbf

Authored by Volodymyr Babak
1 parent 7120d61f

Misc improvements

Inline Side-by-side
Showing 3 changed files with 14 additions and 8 deletions
@@ -34,12 +34,14 @@ metadata: @@ -34,12 +34,14 @@ metadata:
34 name: cassandra 34 name: cassandra
35 spec: 35 spec:
36 serviceName: cassandra-headless 36 serviceName: cassandra-headless
37 - replicas: 3 37 + replicas: 2
38 template: 38 template:
39 metadata: 39 metadata:
40 labels: 40 labels:
41 app: cassandra 41 app: cassandra
42 spec: 42 spec:
  43 + nodeSelector:
  44 + machinetype: other
43 affinity: 45 affinity:
44 podAntiAffinity: 46 podAntiAffinity:
45 requiredDuringSchedulingIgnoredDuringExecution: 47 requiredDuringSchedulingIgnoredDuringExecution:
@@ -75,7 +77,7 @@ spec: @@ -75,7 +77,7 @@ spec:
75 command: ["/bin/sh", "-c", "PID=$(pidof java) && kill $PID && while ps -p $PID > /dev/null; do sleep 1; done"] 77 command: ["/bin/sh", "-c", "PID=$(pidof java) && kill $PID && while ps -p $PID > /dev/null; do sleep 1; done"]
76 env: 78 env:
77 - name: MAX_HEAP_SIZE 79 - name: MAX_HEAP_SIZE
78 - value: 512M 80 + value: 2048M
79 - name: HEAP_NEWSIZE 81 - name: HEAP_NEWSIZE
80 value: 100M 82 value: 100M
81 - name: CASSANDRA_SEEDS 83 - name: CASSANDRA_SEEDS
@@ -118,7 +120,7 @@ spec: @@ -118,7 +120,7 @@ spec:
118 accessModes: [ "ReadWriteOnce" ] 120 accessModes: [ "ReadWriteOnce" ]
119 resources: 121 resources:
120 requests: 122 requests:
121 - storage: 2Gi 123 + storage: 3Gi
122 - metadata: 124 - metadata:
123 name: cassandra-commitlog 125 name: cassandra-commitlog
124 annotations: 126 annotations:
@@ -127,4 +129,4 @@ spec: @@ -127,4 +129,4 @@ spec:
127 accessModes: [ "ReadWriteOnce" ] 129 accessModes: [ "ReadWriteOnce" ]
128 resources: 130 resources:
129 requests: 131 requests:
130 - storage: 1Gi  
  132 + storage: 2Gi
@@ -41,7 +41,7 @@ spec: @@ -41,7 +41,7 @@ spec:
41 selector: 41 selector:
42 matchLabels: 42 matchLabels:
43 app: tb 43 app: tb
44 - minAvailable: 2 44 + minAvailable: 3
45 --- 45 ---
46 apiVersion: v1 46 apiVersion: v1
47 kind: ConfigMap 47 kind: ConfigMap
@@ -58,12 +58,14 @@ metadata: @@ -58,12 +58,14 @@ metadata:
58 name: tb 58 name: tb
59 spec: 59 spec:
60 serviceName: "tb-service" 60 serviceName: "tb-service"
61 - replicas: 2 61 + replicas: 3
62 template: 62 template:
63 metadata: 63 metadata:
64 labels: 64 labels:
65 app: tb 65 app: tb
66 spec: 66 spec:
  67 + nodeSelector:
  68 + machinetype: tb
67 affinity: 69 affinity:
68 podAntiAffinity: 70 podAntiAffinity:
69 requiredDuringSchedulingIgnoredDuringExecution: 71 requiredDuringSchedulingIgnoredDuringExecution:
@@ -35,7 +35,7 @@ kind: ConfigMap @@ -35,7 +35,7 @@ kind: ConfigMap
35 metadata: 35 metadata:
36 name: zk-config 36 name: zk-config
37 data: 37 data:
38 - ensemble: "zk-0;zk-1;zk-2" 38 + ensemble: "zk-0;zk-1"
39 replicas: "3" 39 replicas: "3"
40 jvm.heap: "500m" 40 jvm.heap: "500m"
41 tick: "2000" 41 tick: "2000"
@@ -64,7 +64,7 @@ metadata: @@ -64,7 +64,7 @@ metadata:
64 name: zk 64 name: zk
65 spec: 65 spec:
66 serviceName: zk-headless 66 serviceName: zk-headless
67 - replicas: 3 67 + replicas: 2
68 template: 68 template:
69 metadata: 69 metadata:
70 labels: 70 labels:
@@ -72,6 +72,8 @@ spec: @@ -72,6 +72,8 @@ spec:
72 annotations: 72 annotations:
73 pod.alpha.kubernetes.io/initialized: "true" 73 pod.alpha.kubernetes.io/initialized: "true"
74 spec: 74 spec:
  75 + nodeSelector:
  76 + machinetype: other
75 affinity: 77 affinity:
76 podAntiAffinity: 78 podAntiAffinity:
77 requiredDuringSchedulingIgnoredDuringExecution: 79 requiredDuringSchedulingIgnoredDuringExecution: