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

* Do not deploy jobs pod and use mode all when eventbus type is unset * validate eventbus type param * bump version
observIQ · Oct 25, 2024 · e709aea · e709aea
1 parent cd76de3
commit e709aea
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/charts/bindplane/Chart.yaml b/charts/bindplane/Chart.yaml
@@ -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

diff --git a/charts/bindplane/README.md b/charts/bindplane/README.md
@@ -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.
 

diff --git a/charts/bindplane/templates/bindplane-jobs.yaml b/charts/bindplane/templates/bindplane-jobs.yaml
@@ -1,4 +1,4 @@
-{{- if eq (include "bindplane.deployment_type" .) "Deployment" }}
+{{- if ne .Values.eventbus.type "" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/charts/bindplane/templates/bindplane.yaml b/charts/bindplane/templates/bindplane.yaml
@@ -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 "" }}
               value: all
               {{- else }}
               value: node

diff --git a/charts/bindplane/values.schema.json b/charts/bindplane/values.schema.json
@@ -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'."
+        }
+      },
+      "additionalProperties": true
     }
   }
-  
+}