简柏林 / thingskit · Commits

Commit feb9f07b47f9ec150ec457468772a473c1bac496

Authored by Volodymyr Babak
1 parent 2adfe0c3

Fixes to be in sync with minikube 1.6.2

Inline Side-by-side
Showing 3 changed files with 24 additions and 12 deletions
@@ -15,4 +15,4 @@ @@ -15,4 +15,4 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
18 -kubectl -n thingsboard delete svc,sts,deploy,pv,pvc,cm,po,ing --all --include-uninitialized 18 +kubectl -n thingsboard delete svc,sts,deploy,pv,pvc,cm,po,ing --all
@@ -28,7 +28,7 @@ spec: @@ -28,7 +28,7 @@ spec:
28 requests: 28 requests:
29 storage: 5Gi 29 storage: 5Gi
30 --- 30 ---
31 -apiVersion: extensions/v1beta1 31 +apiVersion: apps/v1
32 kind: Deployment 32 kind: Deployment
33 metadata: 33 metadata:
34 name: postgres 34 name: postgres
@@ -36,6 +36,9 @@ metadata: @@ -36,6 +36,9 @@ metadata:
36 labels: 36 labels:
37 app: postgres 37 app: postgres
38 spec: 38 spec:
  39 + selector:
  40 + matchLabels:
  41 + app: postgres
39 template: 42 template:
40 metadata: 43 metadata:
41 labels: 44 labels:
@@ -14,12 +14,15 @@ @@ -14,12 +14,15 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -apiVersion: extensions/v1beta1 17 +apiVersion: apps/v1
18 kind: Deployment 18 kind: Deployment
19 metadata: 19 metadata:
20 name: zookeeper 20 name: zookeeper
21 namespace: thingsboard 21 namespace: thingsboard
22 spec: 22 spec:
  23 + selector:
  24 + matchLabels:
  25 + app: zookeeper
23 template: 26 template:
24 metadata: 27 metadata:
25 labels: 28 labels:
@@ -59,12 +62,15 @@ spec: @@ -59,12 +62,15 @@ spec:
59 - name: zk-port 62 - name: zk-port
60 port: 2181 63 port: 2181
61 --- 64 ---
62 -apiVersion: extensions/v1beta1 65 +apiVersion: apps/v1
63 kind: Deployment 66 kind: Deployment
64 metadata: 67 metadata:
65 name: tb-kafka 68 name: tb-kafka
66 namespace: thingsboard 69 namespace: thingsboard
67 spec: 70 spec:
  71 + selector:
  72 + matchLabels:
  73 + app: tb-kafka
68 template: 74 template:
69 metadata: 75 metadata:
70 labels: 76 labels:
@@ -122,12 +128,15 @@ spec: @@ -122,12 +128,15 @@ spec:
122 - name: tb-kafka-port 128 - name: tb-kafka-port
123 port: 9092 129 port: 9092
124 --- 130 ---
125 -apiVersion: extensions/v1beta1 131 +apiVersion: apps/v1
126 kind: Deployment 132 kind: Deployment
127 metadata: 133 metadata:
128 name: tb-redis 134 name: tb-redis
129 namespace: thingsboard 135 namespace: thingsboard
130 spec: 136 spec:
  137 + selector:
  138 + matchLabels:
  139 + app: tb-redis
131 template: 140 template:
132 metadata: 141 metadata:
133 labels: 142 labels:
@@ -168,7 +177,7 @@ spec: @@ -168,7 +177,7 @@ spec:
168 - name: tb-redis-port 177 - name: tb-redis-port
169 port: 6379 178 port: 6379
170 --- 179 ---
171 -apiVersion: extensions/v1beta1 180 +apiVersion: apps/v1
172 kind: Deployment 181 kind: Deployment
173 metadata: 182 metadata:
174 name: tb-js-executor 183 name: tb-js-executor
@@ -204,7 +213,7 @@ spec: @@ -204,7 +213,7 @@ spec:
204 value: "1000" 213 value: "1000"
205 restartPolicy: Always 214 restartPolicy: Always
206 --- 215 ---
207 -apiVersion: extensions/v1beta1 216 +apiVersion: apps/v1
208 kind: Deployment 217 kind: Deployment
209 metadata: 218 metadata:
210 name: tb-node 219 name: tb-node
@@ -293,7 +302,7 @@ spec: @@ -293,7 +302,7 @@ spec:
293 - port: 8080 302 - port: 8080
294 name: http 303 name: http
295 --- 304 ---
296 -apiVersion: extensions/v1beta1 305 +apiVersion: apps/v1
297 kind: Deployment 306 kind: Deployment
298 metadata: 307 metadata:
299 name: tb-mqtt-transport 308 name: tb-mqtt-transport
@@ -368,7 +377,7 @@ spec: @@ -368,7 +377,7 @@ spec:
368 targetPort: 1883 377 targetPort: 1883
369 name: mqtt 378 name: mqtt
370 --- 379 ---
371 -apiVersion: extensions/v1beta1 380 +apiVersion: apps/v1
372 kind: Deployment 381 kind: Deployment
373 metadata: 382 metadata:
374 name: tb-http-transport 383 name: tb-http-transport
@@ -442,7 +451,7 @@ spec: @@ -442,7 +451,7 @@ spec:
442 - port: 8080 451 - port: 8080
443 name: http 452 name: http
444 --- 453 ---
445 -apiVersion: extensions/v1beta1 454 +apiVersion: apps/v1
446 kind: Deployment 455 kind: Deployment
447 metadata: 456 metadata:
448 name: tb-coap-transport 457 name: tb-coap-transport
@@ -510,7 +519,7 @@ spec: @@ -510,7 +519,7 @@ spec:
510 name: coap 519 name: coap
511 protocol: UDP 520 protocol: UDP
512 --- 521 ---
513 -apiVersion: extensions/v1beta1 522 +apiVersion: apps/v1
514 kind: Deployment 523 kind: Deployment
515 metadata: 524 metadata:
516 name: tb-web-ui 525 name: tb-web-ui
@@ -568,7 +577,7 @@ spec: @@ -568,7 +577,7 @@ spec:
568 - port: 8080 577 - port: 8080
569 name: http 578 name: http
570 --- 579 ---
571 -apiVersion: extensions/v1beta1 580 +apiVersion: networking.k8s.io/v1beta1
572 kind: Ingress 581 kind: Ingress
573 metadata: 582 metadata:
574 name: tb-ingress 583 name: tb-ingress