Skip to content
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

Jump to bottom

Update network mapper Helm chart to support new Kafka watcher file-tail mode alongside existing mode #112

Closed
wants to merge 5 commits into from
Closed

Update network mapper Helm chart to support new Kafka watcher file-tail mode alongside existing mode #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
223ccd8
new values flag
orishoshan Aug 25, 2023
b0d3360
Make file-logs default, chart configures k8s-logs instead
orishoshan Aug 25, 2023
ad50d42
update network mapper chart docs
orishoshan Aug 25, 2023
499f9ff
Merge branch 'main' of ssh://github.com/otterize/helm-charts into ori…
orishoshan Aug 25, 2023
7ddcb87
fixup
orishoshan Aug 25, 2023
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
20 changes: 10 additions & 10 deletions network-mapper/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
| `sniffer.priorityClassName`| Set priorityClassName. | `(none)` |

## Kafka watcher parameters
| Key | Description | Default |
|---------------------------------|-------------------------------------------------------------|--------------------------------|
| `kafkawatcher.enable` | Enable Kafka watcher deployment (beta). | `false` |
| `kafkawatcher.image.repository` | Kafka watcher image repository. | `otterize` |
| `kafkawatcher.image.image` | Kafka watcher image. | `network-mapper-kafka-watcher` |
| `kafkawatcher.image.tag` | Kafka watcher image tag. | `latest` |
| `kafkawatcher.pullPolicy` | Kafka watcher pull policy. | `(none)` |
| `kafkawatcher.pullSecrets` | Kafka watcher pull secrets. | `(none)` |
| `kafkawatcher.resources` | Resources override. | `(none)` |
| `kafkawatcher.kafkaServers` | Kafka servers to watch, specified as `pod.namespace` items. | `(none)` |
| Key | Description | Default |
|-----------------------------------|--------------------------------------------------------------------------------------------------------------|--------------------------------|
| `kafkawatcher.enableK8sWatchMode` | Enable Kafka watcher deployment, which reads Kafka logs using the Kubernetes API, for pods in `kafkaServers` | `false` |
| `kafkawatcher.kafkaServers` | Kafka servers to watch, formatted as a list of `pod.namespace`. For example, `["kafka-0.kafka"]` | `(none)` |
| `kafkawatcher.image.repository` | Kafka watcher image repository. | `otterize` |
| `kafkawatcher.image.image` | Kafka watcher image. | `network-mapper-kafka-watcher` |
| `kafkawatcher.image.tag` | Kafka watcher image tag. | `latest` |
| `kafkawatcher.pullPolicy` | Kafka watcher pull policy. | `(none)` |
| `kafkawatcher.pullSecrets` | Kafka watcher pull secrets. | `(none)` |
| `kafkawatcher.resources` | Resources override. | `(none)` |

## Istio watcher parameters
| Key | Description | Default |
Expand Down
2 changes: 1 addition & 1 deletion network-mapper/templates/kafka-watcher-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Values.kafkawatcher.enable }}
{{ if (default .Values.kafkawatcher.enable .Values.kafkawatcher.enableK8sWatchMode) }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
4 changes: 3 additions & 1 deletion network-mapper/templates/kafka-watcher-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Values.kafkawatcher.enable }}
{{ if (default .Values.kafkawatcher.enable .Values.kafkawatcher.enableK8sWatchMode) }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -61,6 +61,8 @@ spec:
- name: OTTERIZE_KAFKA_SERVERS
value: {{ join " " .Values.kafkawatcher.kafkaServers }}
{{ end }}
- name: OTTERIZE_KAFKA_LOG_READ_MODE
value: k8s-logs
{{ if .Values.global.serviceNameOverrideAnnotationName }}
- name: OTTERIZE_SERVICE_NAME_OVERRIDE_ANNOTATION
value: {{ .Values.global.serviceNameOverrideAnnotationName | quote }}
Expand Down
2 changes: 1 addition & 1 deletion network-mapper/templates/kafka-watcher-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Values.kafkawatcher.enable }}
{{ if (default .Values.kafkawatcher.enable .Values.kafkawatcher.enableK8sWatchMode) }}
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down
6 changes: 3 additions & 3 deletions network-mapper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sniffer:
#The options to add tolerations
# tolerations:
# - operator: Exists
priorityClassName: ""
priorityClassName: ""
resources: { }
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand All @@ -43,13 +43,13 @@ sniffer:
# memory: 128Mi

kafkawatcher:
enable: false # enable/disable entire installation of the kafka-watcher
enableK8sWatchMode: false # enable/disable entire installation of the kafka-watcher
repository: otterize
image: network-mapper-kafka-watcher
pullPolicy:
pullSecrets:
resources: { }
# Kafka servers to watch, specified as `pod.namespace` items.
# Kafka servers to watch, formatted as `pod.namespace`. For example, `kafka-0.kafka`
kafkaServers: []
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down
Loading