Skip to content

Commit 8ef3f1c

Browse files
rainerschammrainerschamm
committed
Merge branch 'develop'
2 parents 20e69f2 + 411bf38 commit 8ef3f1c

29 files changed

+321
-37
lines changed

‎assets/docker/kafka-connect/Dockerfile.8.0.0‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ RUN confluent-hub install --no-prompt confluentinc/kafka-connect-http-source:1.0
77
RUN confluent-hub install --no-prompt confluentinc/kafka-connect-elasticsearch:15.0.1
88
RUN confluent-hub install --no-prompt confluentinc/kafka-connect-s3-source:2.6.16
99
RUN confluent-hub install --no-prompt confluentinc/kafka-connect-s3:10.6.7
10-
RUN confluent-hub install --no-prompt debezium/debezium-connector-sqlserver:3.1.2
1110
RUN confluent-hub install --no-prompt debezium/debezium-connector-postgresql:3.1.2
1211
RUN confluent-hub install --no-prompt debezium/debezium-connector-mysql:3.1.2
13-
RUN confluent-hub install --no-prompt debezium/debezium-connector-mongodb:3.1.2
14-
RUN confluent-hub install --no-prompt dariobalinzo/kafka-connect-elasticsearch-source:1.5.5
15-
RUN confluent-hub install --no-prompt iceberg/iceberg-kafka-connect:1.9.1
12+
# RUN confluent-hub install --no-prompt iceberg/iceberg-kafka-connect:1.9.1

‎assets/kind/README.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,43 @@ docker push localhost:5001/confluentinc/cp-kafka-rest:8.0.0
3636
docker push localhost:5001/confluentinc/cp-ksqldb-server:8.0.0
3737
docker push localhost:5001/lsdtrip/kafka-connect:0.46.1-kafka-4.0.0
3838
docker push localhost:5001/kafbat/kafka-ui:v1.2.0
39+
40+
## After the local registry is working for Kind, you can do the following (for CfK 3.0.0 and CP 8.0.0)
41+
docker pull lsdopen/kafka-army-knife:latest
42+
docker pull confluentinc/confluent-operator:0.1263.8
43+
docker pull confluentinc/confluent-init-container:3.0.0
44+
docker pull confluentinc/cp-server:8.0.0
45+
docker pull confluentinc/cp-server-connect:8.0.0
46+
docker pull confluentinc/cp-schema-registry:8.0.0
47+
docker pull confluentinc/cp-kafka-rest:8.0.0
48+
docker pull confluentinc/cp-ksqldb-server:8.0.0
49+
docker pull confluentinc/cp-enterprise-control-center-next-gen:2.2.0
50+
docker pull confluentinc/confluent-cli:latest
51+
docker pull lsdtrip/kafka-lag-exporter:latest
52+
docker pull osixia/openldap:1.5.0
53+
54+
docker tag lsdopen/kafka-army-knife:latest localhost:5001/lsdopen/kafka-army-knife:latest
55+
docker tag confluentinc/confluent-operator:0.1263.8 localhost:5001/confluentinc/confluent-operator:0.1263.8
56+
docker tag confluentinc/confluent-init-container:3.0.0 localhost:5001/confluentinc/confluent-init-container:3.0.0
57+
docker tag confluentinc/cp-server:8.0.0 localhost:5001/confluentinc/cp-server:8.0.0
58+
docker tag confluentinc/cp-server-connect:8.0.0 localhost:5001/confluentinc/cp-server-connect:8.0.0
59+
docker tag confluentinc/cp-schema-registry:8.0.0 localhost:5001/confluentinc/cp-schema-registry:8.0.0
60+
docker tag confluentinc/cp-kafka-rest:8.0.0 localhost:5001/confluentinc/cp-kafka-rest:8.0.0
61+
docker tag confluentinc/cp-ksqldb-server:8.0.0 localhost:5001/confluentinc/cp-ksqldb-server:8.0.0
62+
docker tag confluentinc/cp-enterprise-control-center-next-gen:2.2.0 localhost:5001/confluentinc/cp-enterprise-control-center-next-gen:2.2.0
63+
docker tag confluentinc/confluent-cli:latest localhost:5001/confluentinc/confluent-cli:latest
64+
docker tag lsdtrip/kafka-lag-exporter:latest localhost:5001/lsdtrip/kafka-lag-exporter:latest
65+
docker tag osixia/openldap:1.5.0 localhost:5001/osixia/openldap:1.5.0
66+
67+
docker push localhost:5001/lsdopen/kafka-army-knife:latest
68+
docker push localhost:5001/confluentinc/confluent-operator:0.1263.8
69+
docker push localhost:5001/confluentinc/confluent-init-container:3.0.0
70+
docker push localhost:5001/confluentinc/cp-server:8.0.0
71+
docker push localhost:5001/confluentinc/cp-server-connect:8.0.0
72+
docker push localhost:5001/confluentinc/cp-schema-registry:8.0.0
73+
docker push localhost:5001/confluentinc/cp-kafka-rest:8.0.0
74+
docker push localhost:5001/confluentinc/cp-ksqldb-server:8.0.0
75+
docker push localhost:5001/confluentinc/cp-enterprise-control-center-next-gen:2.2.0
76+
docker push localhost:5001/confluentinc/confluent-cli:latest
77+
docker push localhost:5001/lsdtrip/kafka-lag-exporter:latest
78+
docker push localhost:5001/osixia/openldap:1.5.0

‎assets/terraform/strimzi/mesp.tf‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,38 @@ module "observe" {
4343
depends_on = [module.ingress-nginx]
4444
}
4545

46+
data "kubernetes_nodes" "all_kube_nodes" {
47+
depends_on = [module.ingress-nginx]
48+
}
49+
50+
resource "kubernetes_labels" "kafka_worker_labels" {
51+
count = var.number_kafka_brokers
52+
53+
api_version = "v1"
54+
kind = "Node"
55+
metadata {
56+
name = data.kubernetes_nodes.all_kube_nodes.nodes[count.index+1].metadata.0.name
57+
}
58+
labels = {
59+
"accept-pod" = "lsdmesp-broker-${count.index}"
60+
}
61+
}
62+
4663
module "eks-blueprint-mesp" {
4764
source = "app.terraform.io/lsdopen/eks-blueprint-mesp/aws"
48-
version = "1.5.24"
65+
version = "1.5.26"
4966

5067
# cluster_name = "kind"
51-
base_url = "apps.mesp.lsdopen.io"
68+
base_url = "mesp.lsdopen.io"
5269
cluster_issuer_name = "issuer"
5370
ingress_class_name = "nginx"
5471
kafka_ingress_class_name = "nginx"
72+
kafka_ingress_enabled = false
5573

5674
namespace = "lsdmesp"
5775

5876
strimzi = true
77+
strimzi_connect = false
5978

6079
monitoring = var.enable-monitoring
6180

@@ -69,6 +88,7 @@ module "eks-blueprint-mesp" {
6988
depends_on = [
7089
module.ingress-nginx,
7190
module.cert-manager,
72-
module.observe
91+
module.observe,
92+
kubernetes_labels.kafka_worker_labels
7393
]
7494
}

‎assets/terraform/strimzi/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ variable "enable-army-knife" {
2121
type = bool
2222
default = true
2323
}
24+
25+
variable "number_kafka_brokers" {
26+
description = "Number of brokers"
27+
type = number
28+
default = "3"
29+
}

‎charts/confluent/Chart.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ dependencies:
88
- name: confluent-for-kubernetes
99
repository: https://packages.confluent.io/helm
1010
version: 0.1263.8
11-
digest: sha256:3e44fd9e01873093782875592b35208177d130ec116e545a7222ef7b33317fa5
12-
generated: "2025-07-10T09:42:50.362047+02:00"
11+
digest: sha256:b51fedd748a860eb27edee9c85359defa5b26065a1a1dd957f940561f2a332c6
12+
generated: "2025-07-23T13:09:10.753279+02:00"

‎charts/confluent/Chart.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: lsdmesp-confluent
3-
version: "0.6.19"
4-
appVersion: "0.6.19"
3+
version: "0.6.20"
4+
appVersion: "0.6.20"
55
description: 'LSDMESP CFK: LSD Event Streaming Platform with Confluent Operator'
66
keywords:
77
- lsdmesp
@@ -28,9 +28,11 @@ dependencies:
2828
- name: flink-kubernetes-operator
2929
version: "1.120.1"
3030
repository: https://packages.confluent.io/helm
31+
condition: lsdmesp.confluent.flink.enabled
3132
- name: confluent-manager-for-apache-flink
3233
version: "2.0.1"
3334
repository: https://packages.confluent.io/helm
35+
condition: lsdmesp.confluent.flink.enabled
3436
- name: confluent-for-kubernetes
3537
version: "0.1263.8"
3638
repository: https://packages.confluent.io/helm

‎charts/confluent/install-kind.sh‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
cat ../../values-kind.yaml | yq -r .lsdmesp.tls.ca.cert > ca.crt
4+
cat ../../values-kind.yaml | yq -r .lsdmesp.tls.ca.key > ca.key
5+
6+
keytool -keystore keystore.p12 -alias lsdmesp -keyalg RSA -validity 3650 -genkey -storepass 112233 -keypass 112233 -dname "CN=lsdmesp"
7+
keytool -keystore keystore.p12 -alias lsdmesp -certreq -file lsdmesp.csr -storepass 112233
8+
openssl x509 -req -CA ca.crt -CAkey ca.key -in lsdmesp.csr -out lsdmesp.crt -days 3650 -set_serial "01" -extfile lsdmesp-sans.conf -passin pass:112233 -extensions 'v3_req'
9+
openssl pkcs12 -in keystore.p12 -nodes -nocerts -out lsdmesp.key -password pass:112233
10+
keytool -keystore keystore.p12 -alias CARoot -importcert -file ca.crt -storepass 112233 -noprompt
11+
keytool -keystore keystore.p12 -alias lsdmesp -importcert -file lsdmesp.crt -storepass 112233 -noprompt
12+
13+
openssl rand -out cmf.key 32
14+
15+
kubectl create -f https://github.com/jetstack/cert-manager/releases/download/v1.16.2/cert-manager.yaml
16+
echo "Sleeping a bit for cert-manager"
17+
sleep 10
18+
echo "Done!"
19+
helm dependency update .
20+
kubectl create ns lsdmesp
21+
kubectl config set-context --current --namespace lsdmesp
22+
23+
kubectl create secret generic cmf-encryption-key --from-file=encryption-key=cmf.key
24+
25+
kubectl create configmap cmf-keystore --from-file ./keystore.p12
26+
kubectl create secret generic cmf-day2-tls --from-file=fullchain.pem=./lsdmesp.crt --from-file=privkey.pem=./lsdmesp.key --from-file=cacerts.pem=./ca.crt
27+
28+
helm install lsdmesp . -f ../../values-kind.yaml -n lsdmesp
29+
30+
rm ./cmf.key
31+
rm ./lsdmesp.crt
32+
rm ./lsdmesp.key
33+
rm ./lsdmesp.csr
34+
rm ./keystore.p12
35+
rm ./ca.crt
36+
rm ./ca.key

‎charts/confluent/install.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
cat ../../values.yaml | yq .lsdmesp.tls.ca.cert > ca.crt
4-
cat ../../values.yaml | yq .lsdmesp.tls.ca.key > ca.key
3+
cat ../../values.yaml | yq -r .lsdmesp.tls.ca.cert > ca.crt
4+
cat ../../values.yaml | yq -r .lsdmesp.tls.ca.key > ca.key
55

66
keytool -keystore keystore.p12 -alias lsdmesp -keyalg RSA -validity 3650 -genkey -storepass 112233 -keypass 112233 -dname "CN=lsdmesp"
77
keytool -keystore keystore.p12 -alias lsdmesp -certreq -file lsdmesp.csr -storepass 112233
@@ -27,6 +27,7 @@ kubectl create secret generic cmf-day2-tls --from-file=fullchain.pem=./lsdmesp.c
2727

2828
helm install lsdmesp . -f ../../values.yaml -n lsdmesp
2929

30+
rm ./cmf.key
3031
rm ./lsdmesp.crt
3132
rm ./lsdmesp.key
3233
rm ./lsdmesp.csr

‎charts/confluent/templates/010.kraftcontroller.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ spec:
2020
- listener.name.replication.ssl.truststore.password=${file:/mnt/sslcerts/jksPassword.txt:jksPassword}
2121
dataVolumeCapacity: {{ $kraftcontroller.dataVolumeCapacity }}
2222
image:
23-
application: docker.io/confluentinc/cp-server:{{ .Values.lsdmesp.cpVersion }}
24-
init: confluentinc/confluent-init-container:{{ .Values.lsdmesp.cpOperatorVersion }}
23+
application: {{ .Values.lsdmesp.cpRegistry }}/confluentinc/cp-server:{{ .Values.lsdmesp.cpVersion }}
24+
init: {{ .Values.lsdmesp.cpRegistry }}/confluentinc/confluent-init-container:{{ .Values.lsdmesp.cpOperatorVersion }}
2525
{{- if not ((index .Values "confluent-for-kubernetes" "licenseKey") | empty) }}
2626
license:
2727
globalLicense: true

‎charts/confluent/templates/011.kafka.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ spec:
5454
- RULE:.*CN[\s]?=[\s]?([a-zA-Z0-9.]*)?.*/$1/
5555
type: mtls
5656
image:
57-
application: confluentinc/cp-server:{{ .Values.lsdmesp.cpVersion }}
58-
init: confluentinc/confluent-init-container:{{ .Values.lsdmesp.cpOperatorVersion }}
57+
application: {{ .Values.lsdmesp.cpRegistry }}/confluentinc/cp-server:{{ .Values.lsdmesp.cpVersion }}
58+
init: {{ .Values.lsdmesp.cpRegistry }}/confluentinc/confluent-init-container:{{ .Values.lsdmesp.cpOperatorVersion }}
5959
{{- if not ((index .Values "confluent-for-kubernetes" "licenseKey") | empty) }}
6060
license:
6161
globalLicense: true

0 commit comments

Comments
 (0)