Skip to content

Use args for CLI parameters #244

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.

Sign up for GitHub

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

Draft
wants to merge 29 commits into
base: master
Choose a base branch
from
Draft

Use args for CLI parameters #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3c8880c
Separate CLI and application (#207)
philipp94831 Jul 19, 2024
1ee2c3c
Use args for CLI parameters
philipp94831 Jul 22, 2024
e38af13
Use args for CLI parameters
philipp94831 Jul 22, 2024
92c9d52
Use args for CLI parameters
philipp94831 Jul 22, 2024
632b7fe
Remove guava dependency (#237)
philipp94831 Jul 23, 2024
be8ffc8
Use KAFKA_ as prefix for environment Kafka config (#209)
philipp94831 Jul 23, 2024
8dc843c
Add HostInfo to ImprovedStreamsConfig (#230)
Jul 23, 2024
9b67bc7
Remove log4j dependency and debug parameter (#238)
philipp94831 Jul 24, 2024
cc19d5e
Add default serialization config to apps (#239)
philipp94831 Jul 25, 2024
1a4b565
Rename streams section to kafka in Helm charts (#241)
philipp94831 Jul 25, 2024
3a4af0b
Rename extra topics to labeled topics (#240)
philipp94831 Jul 26, 2024
ecf41c8
Rename `--brokers` to `--bootstrap-servers` (#242)
philipp94831 Jul 26, 2024
878e22b
Add CLI parameter to specify streams application ID (#243)
philipp94831 Jul 29, 2024
c347337
Remove unnecessary schema registry configurations in tests (#248)
philipp94831 Jul 29, 2024
957e4c1
Replace Guava usages (#246)
philipp94831 Jul 29, 2024
a88a343
Rename TestTopologyFactory (#249)
philipp94831 Jul 29, 2024
d1bfa89
Make CleanUpRunner closeable (#247)
philipp94831 Jul 29, 2024
8b34869
Rename Streams section in Helm chart docs (#252)
philipp94831 Aug 5, 2024
935b61d
Fix Sonarqube issues (#253)
philipp94831 Aug 7, 2024
6c1db53
Validate autoscaling mandatory fields when it is enabled (#254)
Aug 8, 2024
8a75197
Validate persistence mandatory chart values (persistence.size) (#255)
Aug 8, 2024
49e7122
Add hook to prepare running of app (#256)
philipp94831 Aug 20, 2024
a41aa8a
Pre-bump version to 3.0.1-SNAPSHOT (#257)
philipp94831 Aug 20, 2024
b4a334b
Merge branch 'v3' into feature/args
philipp94831 Jul 10, 2025
eba2013
Merge branch 'tmp/v3-master' into feature/args
philipp94831 Jul 10, 2025
aabf180
Merge remote-tracking branch 'origin/master' into feature/args
philipp94831 Jul 10, 2025
0c52dae
Update
philipp94831 Jul 10, 2025
8c7e40a
Update
philipp94831 Jul 10, 2025
6080af7
Update
philipp94831 Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions charts/producer-app-cleanup-job/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,29 @@ spec:
resources:
{{ toYaml .Values.resources | indent 12 }}
args:
{{- if hasKey .Values.kafka "bootstrapServers" }}
- --bootstrap-servers
- {{ .Values.kafka.bootstrapServers | quote }}
{{- end }}
{{- if hasKey .Values.kafka "schemaRegistryUrl" }}
- --schema-registry-url
- {{ .Values.kafka.schemaRegistryUrl | quote }}
{{- end }}
{{- if hasKey .Values.kafka "outputTopic" }}
- --output-topic
- {{ .Values.kafka.outputTopic | quote }}
{{- end }}
{{- range $key, $value := .Values.kafka.labeledOutputTopics }}
- --labeled-output-topics
- {{ $key }}={{ $value }}
{{- end }}
{{- range $key, $value := .Values.commandLine }}
- {{ $key | quote }}
- {{ $value | quote }}
{{- end }}
{{- range .Values.commandLineList }}
- {{ . | quote }}
{{- end }}
- clean
env:
- name: ENV_PREFIX
Expand All @@ -56,22 +79,6 @@ spec:
- name: {{ printf "KAFKA_%s" $key | replace "." "_" | upper | quote }}
value: {{ $value | quote }}
{{- end }}
{{- if hasKey .Values.kafka "bootstrapServers" }}
- name: "{{ .Values.configurationEnvPrefix }}_BOOTSTRAP_SERVERS"
value: {{ .Values.kafka.bootstrapServers | quote }}
{{- end }}
{{- if hasKey .Values.kafka "schemaRegistryUrl" }}
- name: "{{ .Values.configurationEnvPrefix }}_SCHEMA_REGISTRY_URL"
value: {{ .Values.kafka.schemaRegistryUrl | quote }}
{{- end }}
{{- if hasKey .Values.kafka "outputTopic" }}
- name: "{{ .Values.configurationEnvPrefix }}_OUTPUT_TOPIC"
value: {{ .Values.kafka.outputTopic | quote }}
{{- end }}
{{- if and (hasKey .Values.kafka "labeledOutputTopics") (.Values.kafka.labeledOutputTopics) }}
- name: "{{ .Values.configurationEnvPrefix }}_LABELED_OUTPUT_TOPICS"
value: "{{- range $key, $value := .Values.kafka.labeledOutputTopics }}{{ $key }}={{ $value }},{{- end }}"
{{- end }}
{{- range $key, $value := .Values.secrets }}
- name: "{{ $key }}"
valueFrom:
Expand All @@ -86,10 +93,6 @@ spec:
name: {{ $value.name }}
key: "{{ $value.key }}"
{{- end }}
{{- range $key, $value := .Values.commandLine }}
- name: "{{ $root.Values.configurationEnvPrefix }}_{{ $key }}"
value: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.env }}
- name: {{ $key | quote }}
value: {{ $value | quote }}
Expand Down
5 changes: 4 additions & 1 deletion charts/producer-app-cleanup-job/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ kafka:
# label: output

commandLine: {}
# MY_CLI_PARAM: "foo-bar"
# --my-cli-param: "foo-bar"
commandLineList: []
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this in order to also pass parameters that are not just key-value pairs (e.g. flags like --large-messages). However, the map config is more suitable if one needs to merge multiple value files because maps do get merged and params can be overriden while lists are fully replaced. Should we rename the configs maybe? args.map and args.list?

# - --my-cli-param
# - foo-bar

env: {}
# MY_ENV_VARIABLE: foo-bar
Expand Down
44 changes: 24 additions & 20 deletions charts/producer-app/templates/_pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,37 @@ spec:
imagePullPolicy: "{{ .Values.imagePullPolicy }}"
resources:
{{ toYaml .Values.resources | indent 6 }}
args:
{{- if hasKey .Values.kafka "bootstrapServers" }}
- --bootstrap-servers
- {{ .Values.kafka.bootstrapServers | quote }}
{{- end }}
{{- if hasKey .Values.kafka "schemaRegistryUrl" }}
- --schema-registry-url
- {{ .Values.kafka.schemaRegistryUrl | quote }}
{{- end }}
{{- if hasKey .Values.kafka "outputTopic" }}
- --output-topic
- {{ .Values.kafka.outputTopic | quote }}
{{- end }}
{{- range $key, $value := .Values.kafka.labeledOutputTopics }}
- --labeled-output-topics
- {{ $key }}={{ $value }}
{{- end }}
{{- range $key, $value := .Values.commandLine }}
- {{ $key | quote }}
- {{ $value | quote }}
{{- end }}
{{- range .Values.commandLineList }}
- {{ . | quote }}
{{- end }}
env:
- name: ENV_PREFIX
value: {{ .Values.configurationEnvPrefix }}_
{{- range $key, $value := .Values.kafka.config }}
- name: {{ printf "KAFKA_%s" $key | replace "." "_" | upper | quote }}
value: {{ $value | quote }}
{{- end }}
{{- if hasKey .Values.kafka "bootstrapServers" }}
- name: "{{ .Values.configurationEnvPrefix }}_BOOTSTRAP_SERVERS"
value: {{ .Values.kafka.bootstrapServers | quote }}
{{- end }}
{{- if hasKey .Values.kafka "schemaRegistryUrl" }}
- name: "{{ .Values.configurationEnvPrefix }}_SCHEMA_REGISTRY_URL"
value: {{ .Values.kafka.schemaRegistryUrl | quote }}
{{- end }}
{{- if hasKey .Values.kafka "outputTopic" }}
- name: "{{ .Values.configurationEnvPrefix }}_OUTPUT_TOPIC"
value: {{ .Values.kafka.outputTopic | quote }}
{{- end }}
{{- if and (hasKey .Values.kafka "labeledOutputTopics") (.Values.kafka.labeledOutputTopics) }}
- name: "{{ .Values.configurationEnvPrefix }}_LABELED_OUTPUT_TOPICS"
value: "{{- range $key, $value := .Values.kafka.labeledOutputTopics }}{{ $key }}={{ $value }},{{- end }}"
{{- end }}
{{- range $key, $value := .Values.secrets }}
- name: "{{ $key }}"
valueFrom:
Expand All @@ -78,10 +86,6 @@ spec:
name: {{ $value.name }}
key: "{{ $value.key }}"
{{- end }}
{{- range $key, $value := .Values.commandLine }}
- name: "{{ $root.Values.configurationEnvPrefix }}_{{ $key }}"
value: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.env }}
- name: {{ $key | quote }}
value: {{ $value | quote }}
Expand Down
5 changes: 4 additions & 1 deletion charts/producer-app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ kafka:
# label: output

commandLine: {}
# MY_CLI_PARAM: "foo-bar"
# --my-cli-param: "foo-bar"
commandLineList: []
# - --my-cli-param
# - foo-bar

env: {}
# MY_ENV_VARIABLE: foo-bar
Expand Down
98 changes: 50 additions & 48 deletions charts/streams-app-cleanup-job/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,59 +48,65 @@ spec:
resources:
{{ toYaml .Values.resources | indent 12 }}
args:
{{- if .Values.kafka.deleteOutput }}
{{- if hasKey .Values.kafka "bootstrapServers" }}
- --bootstrap-servers
- {{ .Values.kafka.bootstrapServers | quote }}
{{- end }}
{{- if hasKey .Values.kafka "schemaRegistryUrl" }}
- --schema-registry-url
- {{ .Values.kafka.schemaRegistryUrl | quote }}
{{- end }}
{{- range .Values.kafka.inputTopics }}
- --input-topics
- {{ . | quote }}
{{- end }}
{{- if hasKey .Values.kafka "inputPattern" }}
- --input-pattern
- {{ .Values.kafka.inputPattern | quote }}
{{- end }}
{{- if hasKey .Values.kafka "outputTopic" }}
- --output-topic
- {{ .Values.kafka.outputTopic | quote }}
{{- end }}
{{- if hasKey .Values.kafka "errorTopic" }}
- --error-topic
- {{ .Values.kafka.errorTopic | quote }}
{{- end }}
{{- range $key, $value := .Values.kafka.labeledOutputTopics }}
- --labeled-output-topics
- {{ $key }}={{ $value }}
{{- end }}
{{- range $key, $value := .Values.kafka.labeledInputTopics }}
- --labeled-input-topics
- {{ $key }}={{ $value | join ";" }}
{{- end }}
{{- range $key, $value := .Values.kafka.labeledInputPatterns }}
- --labeled-input-patterns
- {{ $key }}={{ $value }}
{{- end }}
{{- if hasKey .Values.kafka "applicationId" }}
- --application-id
- {{ .Values.kafka.applicationId | quote }}
{{- end }}
{{- range $key, $value := .Values.commandLine }}
- {{ $key | quote }}
- {{ $value | quote }}
{{- end }}
{{- range .Values.commandLineList }}
- {{ . | quote }}
{{- end }}
{{- if .Values.kafka.deleteOutput }}
- clean
{{- else }}
{{- else }}
- reset
{{- end }}
{{- end }}
env:
- name: ENV_PREFIX
value: {{ .Values.configurationEnvPrefix }}_
{{- range $key, $value := .Values.kafka.config }}
- name: {{ printf "KAFKA_%s" $key | replace "." "_" | upper | quote }}
value: {{ $value | quote }}
{{- end }}
{{- if hasKey .Values.kafka "bootstrapServers" }}
- name: "{{ .Values.configurationEnvPrefix }}_BOOTSTRAP_SERVERS"
value: {{ .Values.kafka.bootstrapServers | quote }}
{{- end }}
{{- if hasKey .Values.kafka "schemaRegistryUrl" }}
- name: "{{ .Values.configurationEnvPrefix }}_SCHEMA_REGISTRY_URL"
value: {{ .Values.kafka.schemaRegistryUrl | quote }}
{{- end }}
{{- if and (hasKey .Values.kafka "inputTopics") (.Values.kafka.inputTopics) }}
- name: "{{ .Values.configurationEnvPrefix }}_INPUT_TOPICS"
value: {{ .Values.kafka.inputTopics | join "," | quote }}
{{- end }}
{{- if hasKey .Values.kafka "inputPattern" }}
- name: "{{ .Values.configurationEnvPrefix }}_INPUT_PATTERN"
value: {{ .Values.kafka.inputPattern | join "," | quote }}
{{- end }}
{{- if hasKey .Values.kafka "outputTopic" }}
- name: "{{ .Values.configurationEnvPrefix }}_OUTPUT_TOPIC"
value: {{ .Values.kafka.outputTopic | quote }}
{{- end }}
{{- if hasKey .Values.kafka "errorTopic" }}
- name: "{{ .Values.configurationEnvPrefix }}_ERROR_TOPIC"
value: {{ .Values.kafka.errorTopic | quote }}
{{- end }}
{{- if and (hasKey .Values.kafka "labeledOutputTopics") (.Values.kafka.labeledOutputTopics) }}
- name: "{{ .Values.configurationEnvPrefix }}_LABELED_OUTPUT_TOPICS"
value: "{{- range $key, $value := .Values.kafka.labeledOutputTopics }}{{ $key }}={{ $value }},{{- end }}"
{{- end }}
{{- $delimiter := ";" }}
{{- if and (hasKey .Values.kafka "labeledInputTopics") (.Values.kafka.labeledInputTopics) }}
- name: "{{ .Values.configurationEnvPrefix }}_LABELED_INPUT_TOPICS"
value: "{{- range $key, $value := .Values.kafka.labeledInputTopics }}{{ $key }}={{ $value | join $delimiter }},{{- end }}"
{{- end }}
{{- if and (hasKey .Values.kafka "labeledInputPatterns") (.Values.kafka.labeledInputPatterns) }}
- name: "{{ .Values.configurationEnvPrefix }}_LABELED_INPUT_PATTERNS"
value: "{{- range $key, $value := .Values.kafka.labeledInputPatterns }}{{ $key }}={{ $value }},{{- end }}"
{{- end }}
{{- if hasKey .Values.kafka "applicationId" }}
- name: "{{ .Values.configurationEnvPrefix }}_APPLICATION_ID"
value: {{ .Values.kafka.applicationId | quote }}
{{- end }}
{{- range $key, $value := .Values.secrets }}
- name: "{{ $key }}"
valueFrom:
Expand All @@ -115,10 +121,6 @@ spec:
name: {{ $value.name }}
key: "{{ $value.key }}"
{{- end }}
{{- range $key, $value := .Values.commandLine }}
- name: "{{ $root.Values.configurationEnvPrefix }}_{{ $key }}"
value: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.env }}
- name: {{ $key | quote }}
value: {{ $value | quote }}
Expand Down
5 changes: 4 additions & 1 deletion charts/streams-app-cleanup-job/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ kafka:
deleteOutput: false

commandLine: {}
# MY_CLI_PARAM: "foo-bar"
# --my-cli-param: "foo-bar"
commandLineList: []
# - --my-cli-param
# - foo-bar

env: {}
# MY_ENV_VARIABLE: foo-bar
Expand Down
Loading
Loading