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.

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

fix: Do not deploy jobs pod when using local eventbus #175

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/bindplane/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: bindplane
description: BindPlane OP is an observability pipeline.
type: application
# The chart's version
version: 1.20.3
version: 1.20.4
# The BindPlane OP tagged release. If the user does not
# set the `image.tag` values option, this version is used.
appVersion: 1.77.0
Expand Down
2 changes: 1 addition & 1 deletion charts/bindplane/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bindplane

![Version: 1.20.3](https://img.shields.io/badge/Version-1.20.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.77.0](https://img.shields.io/badge/AppVersion-1.77.0-informational?style=flat-square)
![Version: 1.20.4](https://img.shields.io/badge/Version-1.20.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.77.0](https://img.shields.io/badge/AppVersion-1.77.0-informational?style=flat-square)

BindPlane OP is an observability pipeline.

Expand Down
2 changes: 1 addition & 1 deletion charts/bindplane/templates/bindplane-jobs.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if eq (include "bindplane.deployment_type" .) "Deployment" }}
{{- if ne .Values.eventbus.type "" }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/bindplane/templates/bindplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
- name: KUBERNETES_CONTAINER_NAME
value: "server"
- name: BINDPLANE_MODE
{{- if eq (include "bindplane.deployment_type" .) "StatefulSet" }}
{{- if eq .Values.eventbus.type "" }}
Copy link
Member Author

Choose a reason for hiding this comment

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

If event bus is not set, set mode to all.

value: all
{{- else }}
value: node
Expand Down
42 changes: 26 additions & 16 deletions charts/bindplane/values.schema.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
{
"$schema": "http://json-schema.org/schema#",
"type": "object",
"properties": {
"nats": {
"type": "object",
"properties": {
"deploymentType": {
"type": "string",
"enum": ["StatefulSet", "Deployment"],
"description": "The type of NATS deployment, either StatefulSet or Deployment."
}
},
"required": ["deploymentType"],
"additionalProperties": true
}
"$schema": "http://json-schema.org/schema#",
"type": "object",
"properties": {
"nats": {
"type": "object",
"properties": {
"deploymentType": {
"type": "string",
"enum": ["StatefulSet", "Deployment"],
"description": "The type of NATS deployment, either StatefulSet or Deployment."
}
},
"required": ["deploymentType"],
"additionalProperties": true
},
"eventbus": {
"type": "object",
"properties": {
"type": {
"type": "string",
"enum": ["", "nats", "pubsub", "kafka"],
"description": "The type of event bus used. Must be one of '', 'nats', 'pubsub', or 'kafka'."
Copy link
Member Author

Choose a reason for hiding this comment

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

This will ensure users only configure eventbus.type with the following values

  • ""
  • "nats"
  • "postgres"
  • "kafka"

Kafka is deprecated, and omitted from docs but should still be supported by the chart.

}
},
"additionalProperties": true
}
}
}
Loading