Skip to content

Commit 11d08c8

Browse files
committed
Merge branch 'release-1.4.0'
2 parents 068ed0f + 379f51b commit 11d08c8

File tree

422 files changed

+22008
-8756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

422 files changed

+22008
-8756
lines changed

.meepctl-repocfg.yaml

Lines changed: 105 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version: 1.3.0
15+
version: 1.4.0
1616
repo:
1717
name: AdvantEDGE
1818
core:
@@ -21,17 +21,8 @@ repo:
2121
cluster-role-binding: charts/meep-user/meep-user-clusterrolebinding.yaml
2222
codecov: false
2323
lint: false
24-
meep-ctrl-engine:
25-
src: go-apps/meep-ctrl-engine
26-
bin: bin/meep-ctrl-engine
27-
chart: charts/meep-ctrl-engine
28-
codecov: true
29-
lint: true
30-
nodeport: 30000
31-
api: go-apps/meep-ctrl-engine/api/swagger.yaml
32-
docker-data:
33-
api: bin/meep-swagger-ui
34-
static: bin/meep-frontend
24+
25+
# CORE APPS (JS)
3526
meep-frontend:
3627
src: js-apps/meep-frontend
3728
bin: bin/meep-frontend
@@ -47,34 +38,24 @@ repo:
4738
api-bundle:
4839
- meep-ctrl-engine
4940
- meep-metrics-engine
41+
- meep-metrics-engine-notification-client
5042
- meep-mg-manager
51-
- meep-mg-app-notification
43+
- meep-mg-app-client
5244
- meep-loc-serv
53-
- meep-loc-serv-notification
54-
meep-webhook:
55-
src: go-apps/meep-webhook
56-
bin: bin/meep-webhook
57-
chart: charts/meep-webhook
58-
build-flags:
59-
- -mod=vendor
60-
codecov: false
61-
lint: true
62-
meep-mg-manager:
63-
src: go-apps/meep-mg-manager
64-
bin: bin/meep-mg-manager
65-
chart: charts/meep-mg-manager
66-
codecov: true
67-
lint: true
68-
nodeport: 30005
69-
api: go-apps/meep-mg-manager/api/swagger.yaml
70-
meep-mon-engine:
71-
src: go-apps/meep-mon-engine
72-
bin: bin/meep-mon-engine
73-
chart: charts/meep-mon-engine
74-
build-flags:
75-
- -mod=vendor
45+
- meep-loc-serv-notification-client
46+
47+
# CORE APPS (GO)
48+
meep-ctrl-engine:
49+
src: go-apps/meep-ctrl-engine
50+
bin: bin/meep-ctrl-engine
51+
chart: charts/meep-ctrl-engine
7652
codecov: true
7753
lint: true
54+
nodeport: 30000
55+
api: go-apps/meep-ctrl-engine/api/swagger.yaml
56+
docker-data:
57+
api: bin/meep-swagger-ui
58+
static: bin/meep-frontend
7859
meep-loc-serv:
7960
src: go-apps/meep-loc-serv
8061
bin: bin/meep-loc-serv
@@ -94,7 +75,23 @@ repo:
9475
codecov: true
9576
lint: true
9677
nodeport: 30008
97-
api: go-apps/meep-metrics-engine/api/swagger.yaml
78+
api: go-apps/meep-metrics-engine/api/v2/swagger.yaml
79+
meep-mg-manager:
80+
src: go-apps/meep-mg-manager
81+
bin: bin/meep-mg-manager
82+
chart: charts/meep-mg-manager
83+
codecov: true
84+
lint: true
85+
nodeport: 30005
86+
api: go-apps/meep-mg-manager/api/swagger.yaml
87+
meep-mon-engine:
88+
src: go-apps/meep-mon-engine
89+
bin: bin/meep-mon-engine
90+
chart: charts/meep-mon-engine
91+
build-flags:
92+
- -mod=vendor
93+
codecov: true
94+
lint: true
9895
meep-tc-engine:
9996
src: go-apps/meep-tc-engine
10097
bin: bin/meep-tc-engine
@@ -113,29 +110,86 @@ repo:
113110
template: charts/meep-virt-engine/virt-templates
114111
codecov: true
115112
lint: true
116-
meep-loc-serv-notification:
113+
meep-webhook:
114+
src: go-apps/meep-webhook
115+
bin: bin/meep-webhook
116+
chart: charts/meep-webhook
117+
build-flags:
118+
- -mod=vendor
119+
codecov: false
120+
lint: true
121+
122+
# # CORE PACKAGES (JS)
123+
# meep-ctrl-engine-client:
124+
# src: js-packages/meep-ctrl-engine-client
125+
# lint: false
126+
# meep-metrics-engine-client:
127+
# src: js-packages/meep-metrics-engine-client
128+
# lint: false
129+
130+
# CORE PACKAGES (GO)
131+
meep-couch:
132+
src: go-packages/meep-couch
133+
lint: true
134+
meep-ctrl-engine-client:
135+
src: go-packages/meep-ctrl-engine-client
136+
lint: false
137+
meep-ctrl-engine-model:
138+
src: go-packages/meep-ctrl-engine-model
139+
lint: true
140+
meep-loc-serv-client:
141+
src: go-packages/meep-loc-serv-client
142+
lint: false
143+
meep-loc-serv-notification-client:
144+
src: go-packages/meep-loc-serv-notification-client
145+
lint: false
117146
api: go-packages/meep-loc-serv-notification-client/api/swagger.yaml
118-
meep-mg-app-notification:
147+
meep-logger:
148+
src: go-packages/meep-logger
149+
lint: true
150+
meep-metric-store:
151+
src: go-packages/meep-metric-store
152+
lint: true
153+
meep-metrics-engine-notification-client:
154+
src: go-packages/meep-metrics-engine-notification-client
155+
lint: false
156+
api: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml
157+
meep-mg-app-client:
158+
src: go-packages/meep-mg-app-client
159+
lint: false
119160
api: go-packages/meep-mg-app-client/api/swagger.yaml
161+
meep-mg-manager-client:
162+
src: go-packages/meep-mg-manager-client
163+
lint: false
164+
meep-mg-manager-model:
165+
src: go-packages/meep-mg-manager-model
166+
lint: true
167+
meep-model:
168+
src: go-packages/meep-model
169+
lint: true
170+
meep-net-char-mgr:
171+
src: go-packages/meep-net-char-mgr
172+
lint: true
173+
meep-redis:
174+
src: go-packages/meep-redis
175+
lint: true
176+
meep-replay-manager:
177+
src: go-packages/meep-replay-manager
178+
lint: true
179+
meep-watchdog:
180+
src: go-packages/meep-watchdog
181+
lint: true
120182
dep:
121183
docker-registry:
122184
chart: charts/docker-registry
123-
elastic:
124-
es:
125-
chart: charts/elasticsearch
126-
pv: charts/elasticsearch/meep-pv-es.yaml
127-
es-curator:
128-
chart: charts/elasticsearch-curator
129-
kibana:
130-
chart: charts/kibana
131-
filebeat:
132-
chart: charts/filebeat
133-
metricbeat:
134-
chart: charts/metricbeat
135185
couchdb:
136186
chart: charts/couchdb
187+
influxdb:
188+
chart: charts/influxdb
137189
redis:
138190
chart: charts/redis
139191
k8s:
140192
kube-state-metrics:
141193
chart: charts/kube-state-metrics
194+
grafana:
195+
chart: charts/grafana

charts/couchdb/templates/statefulset.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,6 @@ spec:
6363
{{- end }}
6464
- name: ERL_FLAGS
6565
value: "{{ range $k, $v := .Values.erlangFlags }} -{{ $k }} {{ $v }} {{ end }}"
66-
livenessProbe:
67-
httpGet:
68-
path: /
69-
port: 5984
70-
initialDelaySeconds: 10
71-
timeoutSeconds: 5
72-
failureThreshold: 10
73-
readinessProbe:
74-
httpGet:
75-
path: /_up
76-
port: 5984
77-
initialDelaySeconds: 10
78-
timeoutSeconds: 5
79-
failureThreshold: 10
8066
resources:
8167
{{ toYaml .Values.resources | indent 12 }}
8268
volumeMounts:

charts/elasticsearch-curator/Chart.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

charts/elasticsearch-curator/OWNERS

Lines changed: 0 additions & 6 deletions
This file was deleted.

charts/elasticsearch-curator/README.md

Lines changed: 0 additions & 52 deletions
This file was deleted.

charts/elasticsearch-curator/templates/NOTES.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

charts/elasticsearch-curator/templates/_helpers.tpl

Lines changed: 0 additions & 44 deletions
This file was deleted.

charts/elasticsearch-curator/templates/configmap.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)