fixup! [PRODUCTSA-1093] Update OPW chart for v2 release

DataDog · Apr 5, 2024 · 7189714 · 7189714
1 parent cdf5a00
commit 7189714
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 35 deletions.
diff --git a/charts/observability-pipelines-worker/CHANGELOG.md b/charts/observability-pipelines-worker/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 2.0.0
 
 * GA release of Observability Pipelines Worker v2
-* Removed `datadog.remoteConfigurationEnabled` and `datadog.pipelineConfig` values
+* Removed `datadog.remoteConfigurationEnabled` and `pipelineConfig` values
 
 ## 1.8.1
 

diff --git a/charts/observability-pipelines-worker/README.md b/charts/observability-pipelines-worker/README.md
@@ -128,7 +128,6 @@ The command removes all the Kubernetes components associated with the chart and
 | persistence.selector | object | `{}` | Specify the selectors for PersistentVolumeClaims. |
 | persistence.size | string | `"10Gi"` | Specify the size of PersistentVolumeClaims. |
 | persistence.storageClassName | string | `nil` | Specify the storageClassName for PersistentVolumeClaims. |
-| pipelineConfig | object | `{}` | This section supports using Helm templates to populate dynamic values. See Observability Pipelines' [configuration documentation](https://docs.datadoghq.com/observability_pipelines/reference/) for all options. |
 | podAnnotations | object | `{}` | Set annotations on Pods. |
 | podDisruptionBudget.enabled | bool | `false` | If **true**, create a [PodDisruptionBudget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/). |
 | podDisruptionBudget.maxUnavailable | int | `nil` | Specify the number of Pods that can be unavailable after an eviction. |

diff --git a/charts/observability-pipelines-worker/templates/_pod.tpl b/charts/observability-pipelines-worker/templates/_pod.tpl
@@ -72,8 +72,6 @@ containers:
     ports:
 {{- if .Values.containerPorts }}
 {{ toYaml .Values.containerPorts | indent 6 }}
-{{- else if .Values.pipelineConfig }}
-{{- include "opw.containerPorts" . | indent 6 }}
 {{- end }}
 {{- if .Values.datadog.workerAPI.enabled }}
 {{ include "opw.api.containerPort" . | indent 6 }}

diff --git a/charts/observability-pipelines-worker/templates/statefulset.yaml b/charts/observability-pipelines-worker/templates/statefulset.yaml
@@ -22,7 +22,6 @@ spec:
 {{ toYaml .Values.podLabels | indent 8 }}
         {{- end }}
       annotations:
-        checksum/config: {{ tpl (toYaml .Values.pipelineConfig) . | sha256sum }}
         {{- if .Values.podAnnotations }}
 {{ tpl (toYaml .Values.podAnnotations) . | indent 8 }}
         {{- end }}

diff --git a/charts/observability-pipelines-worker/values.yaml b/charts/observability-pipelines-worker/values.yaml
@@ -252,36 +252,6 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-# pipelineConfig -- This section supports using Helm templates to populate dynamic values. See Observability Pipelines'
-# [configuration documentation](https://docs.datadoghq.com/observability_pipelines/reference/) for all options.
-pipelineConfig: {}
-#  sources:
-#    datadog_agents:
-#      type: datadog_agent
-#      address: 0.0.0.0:8282
-#      multiple_outputs: true
-#      store_api_key: false
-#  sinks:
-#    datadog_logs:
-#      type: datadog_logs
-#      inputs:
-#        - datadog_agents.logs
-#      compression: gzip
-#      default_api_key: ${DD_API_KEY}
-#      site: ${DD_SITE}
-#    datadog_metrics:
-#      type: datadog_metrics
-#      inputs:
-#        - datadog_agents.metrics
-#      default_api_key: ${DD_API_KEY}
-#      site: ${DD_SITE}
-#    datadog_traces:
-#      type: datadog_traces
-#      inputs:
-#        - datadog_agents.traces
-#      default_api_key: ${DD_API_KEY}
-#      site: ${DD_SITE}
-
 # extraVolumes -- Specify additional Volumes to use.
 extraVolumes: []