Skip to content

Commit 9530bcc

Browse files
eloiferrereloiferrer
committed
refactor mediawiki events chart
1 parent 5177cc0 commit 9530bcc

File tree

23 files changed

+84
-72
lines changed

23 files changed

+84
-72
lines changed

‎charts/eventgate/Chart.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v2
2+
name: eventgate
3+
description: Eventgate chart to push events into kafka
4+
type: application
5+
version: 0.1.0
6+
appVersion: "1.0.0"

charts/mediawiki-events/templates/eventgate-config.yaml renamed to charts/eventgate/templates/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ data:
66
config.yaml: |
77
num_workers: 1
88
logging:
9-
level: {{ .Values.eventgate.loggingLevel | quote }}
9+
level: {{ .Values.loggingLevel | quote }}
1010
services:
1111
- name: eventgate-wikimedia
1212
module: eventgate/app.js
@@ -19,7 +19,7 @@ data:
1919
schema_base_uris:
2020
- http://schema-registry/primary/jsonschema
2121
- http://schema-registry/secondary/jsonschema
22-
test_mode: {{ .Values.eventgate.testMode | default false }}
22+
test_mode: {{ .Values.testMode | default false }}
2323
kafka:
2424
conf:
2525
metadata.broker.list: 'kafka-0.kafka.{{ .Release.Namespace }}.svc.cluster.local:9092'

charts/mediawiki-events/templates/eventgate-deployment.yaml renamed to charts/eventgate/templates/deployment.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
name: eventgate-config
2121
containers:
2222
- name: eventgate
23-
image: "{{ .Values.eventgate.image.repository }}:{{ .Values.eventgate.image.tag }}"
23+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
2424
env:
2525
- name: CONFIG_FILE
2626
value: "/srv/service/config.yaml"
@@ -36,8 +36,8 @@ spec:
3636
subPath: config.yaml
3737
resources:
3838
requests:
39-
cpu: {{ .Values.eventgate.resources.requests.cpu }}
40-
memory: {{ .Values.eventgate.resources.requests.memory }}
39+
cpu: {{ .Values.resources.requests.cpu }}
40+
memory: {{ .Values.resources.requests.memory }}
4141
limits:
42-
cpu: {{ .Values.eventgate.resources.limits.cpu }}
43-
memory: {{ .Values.eventgate.resources.limits.memory }}
42+
cpu: {{ .Values.resources.limits.cpu }}
43+
memory: {{ .Values.resources.limits.memory }}

charts/mediawiki-events/templates/eventgate-service.yaml renamed to charts/eventgate/templates/service.yaml

File renamed without changes.

‎charts/eventgate/values.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
image:
2+
repository: docker-registry.wikimedia.org/wikimedia/eventgate-wikimedia
3+
tag: ffd68c0de41e3395e2f8ba9422fbe8824c2a49ff
4+
numWorkers: 1
5+
loggingLevel: "info"
6+
testMode: false
7+
resources:
8+
requests:
9+
cpu: "100m"
10+
memory: "256Mi"
11+
limits:
12+
cpu: "500m"
13+
memory: "512Mi"

‎charts/eventstreams/Chart.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v2
2+
name: eventstreams
3+
description: Eventstreams chart (stream mediawiki events)
4+
type: application
5+
version: 0.1.0
6+
appVersion: "1.0.0"

charts/mediawiki-events/templates/eventstreams-config.yaml renamed to charts/eventstreams/templates/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
name: eventstreams-config
55
data:
66
config.yaml: |
7-
num_workers: {{ .Values.eventstreams.numWorkers | default 1 }}
7+
num_workers: {{ .Values.numWorkers | default 1 }}
88
logging:
9-
level: {{ .Values.eventstreams.loggingLevel | quote }}
9+
level: {{ .Values.loggingLevel | quote }}
1010
1111
services:
1212
- name: eventstreams

charts/mediawiki-events/templates/eventstreams-deployment.yaml renamed to charts/eventstreams/templates/deployment.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: eventstreams
17-
image: "{{ .Values.eventstreams.image.repository }}:{{ .Values.eventstreams.image.tag }}"
17+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
1818
ports:
1919
- containerPort: 8092
2020
volumeMounts:
@@ -26,11 +26,11 @@ spec:
2626
subPath: stream-config.yaml
2727
resources:
2828
requests:
29-
cpu: {{ .Values.eventstreams.resources.requests.cpu }}
30-
memory: {{ .Values.eventstreams.resources.requests.memory }}
29+
cpu: {{ .Values.resources.requests.cpu }}
30+
memory: {{ .Values.resources.requests.memory }}
3131
limits:
32-
cpu: {{ .Values.eventstreams.resources.limits.cpu }}
33-
memory: {{ .Values.eventstreams.resources.limits.memory }}
32+
cpu: {{ .Values.resources.limits.cpu }}
33+
memory: {{ .Values.resources.limits.memory }}
3434
volumes:
3535
- name: config-volume
3636
configMap:

charts/mediawiki-events/templates/eventstreams-service.yaml renamed to charts/eventstreams/templates/service.yaml

File renamed without changes.

‎charts/eventstreams/values.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
image:
2+
repository: docker-registry.wikimedia.org/repos/data-engineering/eventstreams
3+
tag: v0.9.0
4+
numWorkers: 1
5+
loggingLevel: "info"
6+
resources:
7+
requests:
8+
cpu: "100m"
9+
memory: "256Mi"
10+
limits:
11+
cpu: "500m"
12+
memory: "512Mi"

0 commit comments

Comments
 (0)