From c770ad32f0fee9a2a64eefcc741406367cac332d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <jh@cominvent.com>
Date: Wed, 4 Dec 2024 12:23:34 +0100
Subject: [PATCH] Be explicit when using empty objects in pipelineConfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>
---
 charts/data-prepper/CHANGELOG.md | 6 +++++-
 charts/data-prepper/Chart.yaml   | 2 +-
 charts/data-prepper/values.yaml  | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/charts/data-prepper/CHANGELOG.md b/charts/data-prepper/CHANGELOG.md
index d0b61260..65f4d058 100644
--- a/charts/data-prepper/CHANGELOG.md
+++ b/charts/data-prepper/CHANGELOG.md
@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.1]
+### Fixed
+- Make `simple-sample-pipeline` survive helm values merge by declaring empty yaml objects explicitly
+
+## [0.1.0]
 ### Added
 - Create initial version of data-prepper helm chart
 
diff --git a/charts/data-prepper/Chart.yaml b/charts/data-prepper/Chart.yaml
index dd53bd76..e701ea29 100644
--- a/charts/data-prepper/Chart.yaml
+++ b/charts/data-prepper/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/data-prepper/values.yaml b/charts/data-prepper/values.yaml
index b63cf837..6f388b26 100644
--- a/charts/data-prepper/values.yaml
+++ b/charts/data-prepper/values.yaml
@@ -109,7 +109,7 @@ pipelineConfig:
       workers: 2      # the number of workers
       delay: 5000     # in milliseconds, how long workers wait between read attempts
       source:
-        random:
+        random: {}
       buffer:
         bounded_blocking:
           buffer_size: 1024     # max number of records the buffer accepts
@@ -118,7 +118,7 @@ pipelineConfig:
         - string_converter:
             upper_case: true
       sink:
-        - stdout:
+        - stdout: {}
 
     ## More Complex example
     # otel-logs-pipeline:
@@ -128,7 +128,7 @@ pipelineConfig:
     #     otel_logs_source:
     #       ssl: false
     #   buffer:
-    #     bounded_blocking:
+    #     bounded_blocking: {}
     #   sink:
     #     - opensearch:
     #         hosts: ["https://opensearch-cluster-master:9200"]
@@ -178,7 +178,7 @@ pipelineConfig:
     #       buffer_size: 25600 # max number of records the buffer accepts
     #       batch_size: 400 # max number of records the buffer drains after each read
     #   processor:
-    #     - otel_traces:
+    #     - otel_traces: {}
     #     - otel_trace_group:
     #         hosts: [ "https://opensearch-cluster-master:9200" ]
     #         insecure: true