Skip to content

Commit 82f338b

Browse files
author
Hagai Barel
committed
Change statefulset to deployment
Update examples for v3 changes
1 parent 732efed commit 82f338b

File tree

6 files changed

+119
-139
lines changed

6 files changed

+119
-139
lines changed

‎examples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ Open up prometheus and see the metrics flow!
2828
* All metrics exported to prometheus will be prefixed with `emq_`
2929
* Some fields specify the `k8s` namespace in which `emq` was deployed (some env vars and the `rolebinding`).
3030
If you're installing in another namespace, make sure to change those
31-
* The image used can be found in [docker hub](https://hub.docker.com/r/kireevco/emqttd/). Feel free to use which ever image you'd like
31+
* The image used can be found in [docker hub](https://hub.docker.com/r/emqx/emqx). Feel free to use which ever image you'd like
3232
* If you change the metrics port (e.g passing `--web.listen-address=PORT`), don't forget to change to annotation and port in the container spec

‎examples/manifests/deployment.yaml

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: emqx
5+
labels:
6+
app.kubernetes.io/name: emqx
7+
app.kubernetes.io/part-of: emqx
8+
spec:
9+
replicas: 2
10+
strategy:
11+
type: RollingUpdate
12+
rollingUpdate:
13+
maxSurge: 25%
14+
maxUnavailable: 25%
15+
selector:
16+
matchLabels:
17+
app.kubernetes.io/name: emqx
18+
app.kubernetes.io/part-of: emqx
19+
template:
20+
metadata:
21+
labels:
22+
app.kubernetes.io/name: emqx
23+
app.kubernetes.io/part-of: emqx
24+
annotations:
25+
prometheus.io/scrape: "true"
26+
prometheus.io/port: "9505"
27+
spec:
28+
serviceAccountName: emqx
29+
containers:
30+
- name: exporter
31+
image: "nuvo/emq_exporter:v0.3.1"
32+
env:
33+
- name: EMQ_PASSWORD
34+
valueFrom:
35+
secretKeyRef:
36+
name: emqx
37+
key: admin_password
38+
- name: POD_IP
39+
valueFrom:
40+
fieldRef:
41+
fieldPath: status.podIP
42+
args:
43+
- --emq.node=emqx@$(POD_IP)
44+
- --emq.api-version=v3
45+
ports:
46+
- name: metrics
47+
containerPort: 9505
48+
- name: emqx
49+
image: "emqx/emqx:v3.0.1"
50+
ports:
51+
- name: mqtt
52+
containerPort: 1883
53+
- name: mgmt
54+
containerPort: 8080
55+
- name: dashboard
56+
containerPort: 18083
57+
env:
58+
- name: EMQX_NODE__COOKIE
59+
valueFrom:
60+
secretKeyRef:
61+
name: emqx
62+
key: node_cookie
63+
- name: EMQX_DASHBOARD__DEFAULT_USER__PASSWORD
64+
valueFrom:
65+
secretKeyRef:
66+
name: emqx
67+
key: admin_password
68+
- name: EMQX_CLUSTER__AUTOCLEAN
69+
value: "5m"
70+
- name: EMQX_CLUSTER__AUTOHEAL
71+
value: "on"
72+
- name: EMQX_CLUSTER__DISCOVERY
73+
value: "k8s"
74+
- name: EMQX_CLUSTER__K8S__ADDRESS_TYPE
75+
value: "ip"
76+
- name: EMQX_CLUSTER__K8S__APISERVER
77+
value: "https://kubernetes.default.svc.cluster.local:443"
78+
- name: EMQX_CLUSTER__K8S__APP_NAME
79+
value: "emqx"
80+
- name: EMQX_CLUSTER__K8S__NAMESPACE
81+
value: "default"
82+
- name: EMQX_CLUSTER__K8S__SERVICE_NAME
83+
value: "emqx"
84+
- name: EMQX_NAME
85+
value: emqx
86+
readinessProbe:
87+
initialDelaySeconds: 20
88+
exec:
89+
command: ["/bin/sh", "-c", "emqx_ctl status | grep 'is running'"]
90+
livenessProbe:
91+
initialDelaySeconds: 20
92+
exec:
93+
command: ["/bin/sh", "-c", "emqx_ctl status | grep 'is running'"]
94+
lifecycle:
95+
preStop:
96+
exec:
97+
command: ["/bin/sh", "-c", "emqx stop"]

‎examples/manifests/rbac.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4-
name: emqtt
4+
name: emqx
55
labels:
6-
app.kubernetes.io/name: emqtt
7-
app.kubernetes.io/part-of: emqtt
6+
app.kubernetes.io/name: emqx
7+
app.kubernetes.io/part-of: emqx
88

99
---
1010

1111
apiVersion: rbac.authorization.k8s.io/v1
1212
kind: Role
1313
metadata:
14-
name: emqtt
14+
name: emqx
1515
labels:
16-
app.kubernetes.io/name: emqtt
17-
app.kubernetes.io/part-of: emqtt
16+
app.kubernetes.io/name: emqx
17+
app.kubernetes.io/part-of: emqx
1818
rules:
1919
- apiGroups: [""]
2020
resources: ["endpoints"]
@@ -25,15 +25,15 @@ rules:
2525
apiVersion: rbac.authorization.k8s.io/v1
2626
kind: RoleBinding
2727
metadata:
28-
name: emqtt
28+
name: emqx
2929
labels:
30-
app.kubernetes.io/name: emqtt
31-
app.kubernetes.io/part-of: emqtt
30+
app.kubernetes.io/name: emqx
31+
app.kubernetes.io/part-of: emqx
3232
roleRef:
3333
apiGroup: rbac.authorization.k8s.io
3434
kind: Role
35-
name: emqtt
35+
name: emqx
3636
subjects:
3737
- kind: ServiceAccount
38-
name: emqtt
38+
name: emqx
3939
namespace: default

‎examples/manifests/secret.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ apiVersion: v1
22
kind: Secret
33
type: Opaque
44
metadata:
5-
name: emqtt
5+
name: emqx
66
labels:
7-
app.kubernetes.io/name: emqtt
8-
app.kubernetes.io/part-of: emqtt
7+
app.kubernetes.io/name: emqx
8+
app.kubernetes.io/part-of: emqx
99
data:
10-
admin_password: dzA4RVF0Qm0xOEtS
10+
#default emqx password - public
11+
admin_password: cHVibGlj
1112
node_cookie: Rmg3T0F3UVVQdzdoZDVJ

‎examples/manifests/service.yaml

+5-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: emqtt-headless
4+
name: emqx
55
labels:
6-
app.kubernetes.io/name: emqtt
7-
app.kubernetes.io/part-of: emqtt
8-
spec:
9-
type: ClusterIP
10-
clusterIP: None
11-
ports:
12-
- name: mapping
13-
port: 4369
14-
targetPort: mapping
15-
selector:
16-
app.kubernetes.io/name: emqtt
17-
app.kubernetes.io/part-of: emqtt
18-
19-
---
20-
21-
apiVersion: v1
22-
kind: Service
23-
metadata:
24-
name: emqtt
25-
labels:
26-
app.kubernetes.io/name: emqtt
27-
app.kubernetes.io/part-of: emqtt
6+
app.kubernetes.io/name: emqx
7+
app.kubernetes.io/part-of: emqx
288
spec:
299
type: ClusterIP
3010
ports:
@@ -38,5 +18,5 @@ spec:
3818
port: 1883
3919
targetPort: mqtt
4020
selector:
41-
app.kubernetes.io/name: emqtt
42-
app.kubernetes.io/part-of: emqtt
21+
app.kubernetes.io/name: emqx
22+
app.kubernetes.io/part-of: emqx

‎examples/manifests/statefulset.yaml

-98
This file was deleted.

0 commit comments

Comments
 (0)