Skip to content

Commit f4dad0b

Browse files
authored
Merge pull request #844 from MetaCell/feature/CH-230
2 parents 031e3d1 + bd6b2e6 commit f4dad0b

18 files changed

Lines changed: 5702 additions & 7754 deletions

File tree

applications/accounts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/keycloak/keycloak:26.4
1+
FROM quay.io/keycloak/keycloak:26.5
22

33
EXPOSE 9000
44
EXPOSE 8080

applications/accounts/admin-event-listener/jar-module/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,14 @@
4646
<dependency>
4747
<groupId>org.apache.kafka</groupId>
4848
<artifactId>kafka-clients</artifactId>
49-
<version>2.5.0</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.lz4</groupId>
52+
<artifactId>lz4-java</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.xerial.snappy</groupId>
56+
<artifactId>snappy-java</artifactId>
5057
</dependency>
5158
</dependencies>
5259

@@ -73,4 +80,4 @@
7380
</plugin>
7481
</plugins>
7582
</build>
76-
</project>
83+
</project>

applications/accounts/admin-event-listener/pom.xml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<keycloak.version>6.0.1</keycloak.version>
2626
<auto-service.version>1.0-rc5</auto-service.version>
2727
<jboss.home>target/keycloak</jboss.home>
28+
<kafka.clients.version>3.9.1</kafka.clients.version>
29+
<lz4-java.version>1.8.1</lz4-java.version>
30+
<snappy-java.version>1.1.10.4</snappy-java.version>
2831
</properties>
2932

3033
<dependencyManagement>
@@ -39,7 +42,17 @@
3942
<dependency>
4043
<groupId>org.apache.kafka</groupId>
4144
<artifactId>kafka-clients</artifactId>
42-
<version>2.5.0</version>
45+
<version>${kafka.clients.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.lz4</groupId>
49+
<artifactId>lz4-java</artifactId>
50+
<version>${lz4-java.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.xerial.snappy</groupId>
54+
<artifactId>snappy-java</artifactId>
55+
<version>${snappy-java.version}</version>
4356
</dependency>
4457

4558
</dependencies>
@@ -67,4 +80,4 @@
6780
</plugins>
6881
</build>
6982

70-
</project>
83+
</project>
Binary file not shown.

applications/argo/deploy/charts/templates/controller/workflow-controller-deployment.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ spec:
7777
ports:
7878
- name: {{ .Values.controller.metricsConfig.portName }}
7979
containerPort: {{ .Values.controller.metricsConfig.port }}
80-
- containerPort: 6060
8180
livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }}
8281
{{- with .Values.controller.extraContainers }}
8382
{{- toYaml . | nindent 8 }}

applications/events/deploy/templates/deployments.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,24 @@ spec:
1313
labels:
1414
app: kafka
1515
spec:
16+
initContainers:
17+
- name: prepare-kafka-data-dir
18+
image: {{ .Values.apps.events.kafka.image | quote }}
19+
imagePullPolicy: {{ .Values.apps.events.kafka.imagePullPolicy }}
20+
command:
21+
- /bin/sh
22+
- -ec
23+
- |
24+
mkdir -p /var/lib/kafka/data
25+
if [ -z "$(find /var/lib/kafka/data -mindepth 1 -maxdepth 1 2>/dev/null)" ]; then
26+
find /var/lib/kafka -mindepth 1 -maxdepth 1 \
27+
! -name lost+found \
28+
! -name data \
29+
-exec mv {} /var/lib/kafka/data/ \;
30+
fi
31+
volumeMounts:
32+
- mountPath: /var/lib/kafka
33+
name: data
1634
containers:
1735
- name: broker
1836
image: {{ .Values.apps.events.kafka.image | quote }}
@@ -37,7 +55,7 @@ spec:
3755
- name: KAFKA_CONTROLLER_QUORUM_VOTERS
3856
value: 1@kafka-0.broker.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.apps.events.kafka.controllerPort }}
3957
- name: KAFKA_LOG_DIRS
40-
value: /var/lib/kafka/data
58+
value: /var/lib/kafka/data/kraft-combined-logs
4159
- name: KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS
4260
value: "0"
4361
{{- range $key, $value := .Values.apps.events.kafka.config }}
@@ -81,7 +99,7 @@ spec:
8199
resources:
82100
{{- .Values.apps.events.kafka.resources | toYaml | nindent 10 }}
83101
volumeMounts:
84-
- mountPath: /var/lib/kafka/data
102+
- mountPath: /var/lib/kafka
85103
name: data
86104
terminationGracePeriodSeconds: 30
87105
updateStrategy:

0 commit comments

Comments
 (0)