-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactoring #91
Open
Nindemic
wants to merge
18
commits into
master
Choose a base branch
from
refactoring
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Refactoring #91
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
0b3d995
Clarify architecture and refactor Terraform
ed0b5af
Divide container_deployment into separate modules
2440d7b
Move container_registry from deployHono modules
0a47210
Persistent file storage
ababecb
Add telemetry storage
f906ed5
Adds kafka liveness probe delay
731e1e6
Add kafka cluster and kafka connector
eb1aebc
Fix READ.ME & update descriptions
84b3b96
Fix kafka ambassador mapping. Remove kafka.jks from setup.sh
msrn 5b1d81b
Fix hono auth with custom kafka
msrn 3bc199d
Modify workflow to support refactored version
msrn 7f48a7b
Fix Terraform dependencies
5f1ae9e
WIP: Kafka connect
msrn 1966a08
Persistent mongo-devicereg
msrn dd80317
Fix cert_manager depencies
msrn 3baa912
Update providers and hono chart
643b820
Update kube prometheus stack
62dceef
Update kafka
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,10 +33,7 @@ service: | |
port: 9094 | ||
auth: | ||
clientProtocol: sasl | ||
interBrokerProtocol: plaintext | ||
jaas: | ||
clientUser: hono | ||
clientPassword: hono-secret | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These option were deprecated on the kafka chart |
||
interBrokerProtocol: sasl | ||
sasl: | ||
jaas: | ||
clientUsers: | ||
|
@@ -45,93 +42,90 @@ auth: | |
- "hono-secret" | ||
zookeeperUser: zookeeperUser | ||
zookeeperPassword: zookeeperPassword | ||
tls: | ||
type: jks | ||
existingSecret: "{{ .Release.Name }}-kafka-jks" | ||
password: honotrust | ||
|
||
extraDeploy: | ||
- | | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: {{ include "kafka.fullname" . }}-connect | ||
labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
app.kubernetes.io/component: connector | ||
spec: | ||
replicas: 1 | ||
selector: | ||
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} | ||
app.kubernetes.io/component: connector | ||
template: | ||
metadata: | ||
labels: {{- include "common.labels.standard" . | nindent 8 }} | ||
app.kubernetes.io/component: connector | ||
spec: | ||
containers: | ||
- name: connect | ||
image: nindemic/mongokafkaconnect:1.0 | ||
imagePullPolicy: IfNotPresent | ||
ports: | ||
- name: connector | ||
containerPort: 8083 | ||
volumeMounts: | ||
- name: configuration | ||
mountPath: /bitnami/kafka/config | ||
volumes: | ||
- name: configuration | ||
configMap: | ||
name: {{ include "kafka.fullname" . }}-connect | ||
- | | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: {{ include "kafka.fullname" . }}-connect | ||
labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
app.kubernetes.io/component: connector | ||
data: | ||
connect-standalone.properties: |- | ||
bootstrap.servers = {{ include "kafka.fullname" . }}-0.{{ include "kafka.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }} | ||
key.converter=org.apache.kafka.connect.json.JsonConverter | ||
value.converter=org.apache.kafka.connect.json.JsonConverter | ||
key.converter.schemas.enable=true | ||
value.converter.schemas.enable=true | ||
offset.storage.file.filename=/tmp/connect.offsets | ||
offset.flush.interval.ms=10000 | ||
plugin.path=/opt/bitnami/kafka/plugins | ||
sasl.mechanism=PLAIN | ||
security.protocol=SASL_PLAINTEXT | ||
sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required \ | ||
username="hono" \ | ||
password="hono-secret"; | ||
consumer.sasl.mechanism=PLAIN | ||
consumer.security.protocol=SASL_PLAINTEXT | ||
consumer.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required \ | ||
username="hono" \ | ||
password="hono-secret"; | ||
mongodb.properties: |- | ||
connection.uri=mongodb://user:[email protected]:28018/mongo-telemetry | ||
name=mongo-sink | ||
topics=. | ||
connector.class=com.mongodb.kafka.connect.MongoSinkConnector | ||
tasks.max=1 | ||
key.converter=org.apache.kafka.connect.json.JsonConverter | ||
value.converter=org.apache.kafka.connect.json.JsonConverter | ||
key.converter.schemas.enable=false | ||
value.converter.schemas.enable=false | ||
database=telemetry | ||
collection=sink | ||
- | | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: {{ include "kafka.fullname" . }}-connect | ||
labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
app.kubernetes.io/component: connector | ||
spec: | ||
ports: | ||
- protocol: TCP | ||
port: 8083 | ||
targetPort: connector | ||
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} | ||
app.kubernetes.io/component: connector | ||
|
||
# extraDeploy: | ||
# - | | ||
# apiVersion: apps/v1 | ||
# kind: Deployment | ||
# metadata: | ||
# name: {{ include "kafka.fullname" . }}-connect | ||
# labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
# app.kubernetes.io/component: connector | ||
# spec: | ||
# replicas: 1 | ||
# selector: | ||
# matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} | ||
# app.kubernetes.io/component: connector | ||
# template: | ||
# metadata: | ||
# labels: {{- include "common.labels.standard" . | nindent 8 }} | ||
# app.kubernetes.io/component: connector | ||
# spec: | ||
# containers: | ||
# - name: connect | ||
# image: nindemic/mongokafkaconnect:1.0 | ||
# imagePullPolicy: IfNotPresent | ||
# ports: | ||
# - name: connector | ||
# containerPort: 8083 | ||
# volumeMounts: | ||
# - name: configuration | ||
# mountPath: /bitnami/kafka/config | ||
# volumes: | ||
# - name: configuration | ||
# configMap: | ||
# name: {{ include "kafka.fullname" . }}-connect | ||
# - | | ||
# apiVersion: v1 | ||
# kind: ConfigMap | ||
# metadata: | ||
# name: {{ include "kafka.fullname" . }}-connect | ||
# labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
# app.kubernetes.io/component: connector | ||
# data: | ||
# connect-standalone.properties: |- | ||
# bootstrap.servers = {{ include "kafka.fullname" . }}-0.{{ include "kafka.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }} | ||
# key.converter=org.apache.kafka.connect.json.JsonConverter | ||
# value.converter=org.apache.kafka.connect.json.JsonConverter | ||
# key.converter.schemas.enable=true | ||
# value.converter.schemas.enable=true | ||
# offset.storage.file.filename=/tmp/connect.offsets | ||
# offset.flush.interval.ms=10000 | ||
# plugin.path=/opt/bitnami/kafka/plugins | ||
# sasl.mechanism=PLAIN | ||
# security.protocol=SASL_PLAINTEXT | ||
# sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required \ | ||
# username="hono" \ | ||
# password="hono-secret"; | ||
# consumer.sasl.mechanism=PLAIN | ||
# consumer.security.protocol=SASL_PLAINTEXT | ||
# consumer.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required \ | ||
# username="hono" \ | ||
# password="hono-secret"; | ||
# mongodb.properties: |- | ||
# connection.uri=mongodb://user:[email protected]:28018/mongo-telemetry | ||
# name=mongo-sink | ||
# topics=. | ||
# connector.class=com.mongodb.kafka.connect.MongoSinkConnector | ||
# tasks.max=1 | ||
# key.converter=org.apache.kafka.connect.json.JsonConverter | ||
# value.converter=org.apache.kafka.connect.json.JsonConverter | ||
# key.converter.schemas.enable=false | ||
# value.converter.schemas.enable=false | ||
# database=telemetry | ||
# collection=sink | ||
# - | | ||
# apiVersion: v1 | ||
# kind: Service | ||
# metadata: | ||
# name: {{ include "kafka.fullname" . }}-connect | ||
# labels: {{- include "common.labels.standard" . | nindent 4 }} | ||
# app.kubernetes.io/component: connector | ||
# spec: | ||
# ports: | ||
# - protocol: TCP | ||
# port: 8083 | ||
# targetPort: connector | ||
# selector: {{- include "common.labels.matchLabels" . | nindent 4 }} | ||
# app.kubernetes.io/component: connector |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Configure Hono to authenticate with custom kafka as common client