diff --git a/charts/observability-pipelines-worker/CHANGELOG.md b/charts/observability-pipelines-worker/CHANGELOG.md index ea0c2d35a..c643a7417 100644 --- a/charts/observability-pipelines-worker/CHANGELOG.md +++ b/charts/observability-pipelines-worker/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.0.0 + +* GA release of Observability Pipelines Worker v2 +* Removed `datadog.remoteConfigurationEnabled` and `pipelineConfig` values + ## 1.8.1 * Migrate from `kubeval` to `kubeconform` for ci chart validation. diff --git a/charts/observability-pipelines-worker/Chart.yaml b/charts/observability-pipelines-worker/Chart.yaml index 592df157c..047bbd8d9 100644 --- a/charts/observability-pipelines-worker/Chart.yaml +++ b/charts/observability-pipelines-worker/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: observability-pipelines-worker -version: "1.8.1" +version: "2.0.0" description: Observability Pipelines Worker type: application keywords: @@ -13,7 +13,7 @@ icon: https://datadog-live.imgix.net/img/dd_logo_70x75.png maintainers: - name: Datadog email: support@datadoghq.com -appVersion: "1.8.0" +appVersion: "2.0.0" annotations: artifacthub.io/links: | - name: Chart Source diff --git a/charts/observability-pipelines-worker/README.md b/charts/observability-pipelines-worker/README.md index cc45ada43..d6e96edeb 100644 --- a/charts/observability-pipelines-worker/README.md +++ b/charts/observability-pipelines-worker/README.md @@ -1,6 +1,6 @@ # Observability Pipelines Worker -![Version: 1.8.1](https://img.shields.io/badge/Version-1.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.8.0](https://img.shields.io/badge/AppVersion-1.8.0-informational?style=flat-square) +![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) ## How to use Datadog Helm repository @@ -93,7 +93,6 @@ The command removes all the Kubernetes components associated with the chart and | datadog.apiKeyExistingSecret | string | `""` | Specify a preexisting Secret that has your API key instead of creating a new one. The value must be stored under the `api-key`. | | datadog.dataDir | string | `"/var/lib/observability-pipelines-worker"` | The data directory for OPW to store runtime data in. | | datadog.pipelineId | string | `nil` | Specify your Datadog Observability Pipelines pipeline ID | -| datadog.remoteConfigurationEnabled | bool | `false` | Whether to allow remote configuration of the worker from Datadog. | | datadog.site | string | `"datadoghq.com"` | The [site](https://docs.datadoghq.com/getting_started/site/) of the Datadog intake to send data to. | | datadog.workerAPI.address | string | `"127.0.0.1:8686"` | Local address to bind the Worker's API to. | | datadog.workerAPI.enabled | bool | `false` | Whether to enable the Worker's API. | @@ -111,7 +110,7 @@ The command removes all the Kubernetes components associated with the chart and | image.pullPolicy | string | `"IfNotPresent"` | Specify the [pullPolicy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy). | | image.pullSecrets | list | `[]` | Specify the [imagePullSecrets](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod). | | image.repository | string | `"gcr.io/datadoghq"` | Specify the image repository to use. | -| image.tag | string | `"1.8.0"` | Specify the image tag to use. | +| image.tag | string | `"2.0.0"` | Specify the image tag to use. | | ingress.annotations | object | `{}` | Specify annotations for the Ingress. | | ingress.className | string | `""` | Specify the [ingressClassName](https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress), requires Kubernetes >= 1.18. | | ingress.enabled | bool | `false` | If **true**, create an Ingress resource. | @@ -129,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/ci/all-values.yaml b/charts/observability-pipelines-worker/ci/all-values.yaml index b1591870f..6da629a1c 100644 --- a/charts/observability-pipelines-worker/ci/all-values.yaml +++ b/charts/observability-pipelines-worker/ci/all-values.yaml @@ -57,30 +57,6 @@ topologySpreadConstraints: topologyKey: topology.kubernetes.io/zone whenUnsatisfiable: ScheduleAnyway -pipelineConfig: - sources: - datadog_agents: - address: 0.0.0.0:8282 - type: datadog_agent - multiple_outputs: true - sinks: - datadog_logs: - type: datadog_logs - inputs: - - datadog_agents.logs - default_api_key: ${DD_API_KEY} - compression: gzip - datadog_metrics: - type: datadog_metrics - inputs: - - datadog_agents.metrics - default_api_key: ${DD_API_KEY} - datadog_traces: - type: datadog_traces - inputs: - - datadog_agents.traces - default_api_key: ${DD_API_KEY} - persistence: enabled: true storageClassName: standard diff --git a/charts/observability-pipelines-worker/ci/api-values.yaml b/charts/observability-pipelines-worker/ci/api-values.yaml index 78c613a4c..0c1af1c16 100644 --- a/charts/observability-pipelines-worker/ci/api-values.yaml +++ b/charts/observability-pipelines-worker/ci/api-values.yaml @@ -4,33 +4,7 @@ datadog: enabled: true playground: false address: "127.0.0.1:1010" -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} + args: - run - --skip-key-validation diff --git a/charts/observability-pipelines-worker/ci/dupe-ports-values.yaml b/charts/observability-pipelines-worker/ci/dupe-ports-values.yaml deleted file mode 100644 index 3d9671856..000000000 --- a/charts/observability-pipelines-worker/ci/dupe-ports-values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -datadog: - pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -args: - - run - - --skip-key-validation -pipelineConfig: - sources: - syslog-tcp: - type: syslog - address: 0.0.0.0:514 - max_length: 102400 - mode: tcp - shutdown_timeout_secs: 30 - syslog-udp: - type: syslog - address: 0.0.0.0:514 - max_length: 102400 - mode: udp - shutdown_timeout_secs: 30 - sinks: - stdout: - type: console - inputs: ["syslog-*"] - encoding: - codec: json diff --git a/charts/observability-pipelines-worker/ci/extraContainers-and-extraVolumeMounts-values.yaml b/charts/observability-pipelines-worker/ci/extraContainers-and-extraVolumeMounts-values.yaml index ebc3898b8..fb25fa8a2 100644 --- a/charts/observability-pipelines-worker/ci/extraContainers-and-extraVolumeMounts-values.yaml +++ b/charts/observability-pipelines-worker/ci/extraContainers-and-extraVolumeMounts-values.yaml @@ -1,28 +1,5 @@ datadog: pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -pipelineConfig: - sources: - datadog_agents: - address: 0.0.0.0:8282 - type: datadog_agent - multiple_outputs: true - sinks: - datadog_logs: - type: datadog_logs - inputs: - - datadog_agents.logs - default_api_key: ${DD_API_KEY} - compression: gzip - datadog_metrics: - type: datadog_metrics - inputs: - - datadog_agents.metrics - default_api_key: ${DD_API_KEY} - datadog_traces: - type: datadog_traces - inputs: - - datadog_agents.traces - default_api_key: ${DD_API_KEY} args: - run - --skip-key-validation diff --git a/charts/observability-pipelines-worker/ci/ingress-values.yaml b/charts/observability-pipelines-worker/ci/ingress-values.yaml index cc629f3e1..238e2a82f 100644 --- a/charts/observability-pipelines-worker/ci/ingress-values.yaml +++ b/charts/observability-pipelines-worker/ci/ingress-values.yaml @@ -1,28 +1,5 @@ datadog: pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -pipelineConfig: - sources: - datadog_agents: - address: 0.0.0.0:8282 - type: datadog_agent - multiple_outputs: true - sinks: - datadog_logs: - type: datadog_logs - inputs: - - datadog_agents.logs - default_api_key: ${DD_API_KEY} - compression: gzip - datadog_metrics: - type: datadog_metrics - inputs: - - datadog_agents.metrics - default_api_key: ${DD_API_KEY} - datadog_traces: - type: datadog_traces - inputs: - - datadog_agents.traces - default_api_key: ${DD_API_KEY} args: - run - --skip-key-validation diff --git a/charts/observability-pipelines-worker/ci/initContainers-values.yaml b/charts/observability-pipelines-worker/ci/initContainers-values.yaml index fe16db03f..4d035ef83 100644 --- a/charts/observability-pipelines-worker/ci/initContainers-values.yaml +++ b/charts/observability-pipelines-worker/ci/initContainers-values.yaml @@ -1,28 +1,5 @@ datadog: pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -pipelineConfig: - sources: - datadog_agents: - address: 0.0.0.0:8282 - type: datadog_agent - multiple_outputs: true - sinks: - datadog_logs: - type: datadog_logs - inputs: - - datadog_agents.logs - default_api_key: ${DD_API_KEY} - compression: gzip - datadog_metrics: - type: datadog_metrics - inputs: - - datadog_agents.metrics - default_api_key: ${DD_API_KEY} - datadog_traces: - type: datadog_traces - inputs: - - datadog_agents.traces - default_api_key: ${DD_API_KEY} args: - run - --skip-key-validation diff --git a/charts/observability-pipelines-worker/ci/kubeconform-values.yaml b/charts/observability-pipelines-worker/ci/kubeconform-values.yaml index 01af0509b..0c510ecac 100644 --- a/charts/observability-pipelines-worker/ci/kubeconform-values.yaml +++ b/charts/observability-pipelines-worker/ci/kubeconform-values.yaml @@ -1,32 +1,6 @@ datadog: pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -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} + args: - run - --skip-key-validation diff --git a/charts/observability-pipelines-worker/ci/manual-port-values.yaml b/charts/observability-pipelines-worker/ci/manual-port-values.yaml index 3d7db0a49..9225e54c9 100644 --- a/charts/observability-pipelines-worker/ci/manual-port-values.yaml +++ b/charts/observability-pipelines-worker/ci/manual-port-values.yaml @@ -1,28 +1,5 @@ datadog: pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -pipelineConfig: - sources: - datadog_agents: - address: 0.0.0.0:8282 - type: datadog_agent - multiple_outputs: true - sinks: - datadog_logs: - type: datadog_logs - inputs: - - datadog_agents.logs - default_api_key: ${DD_API_KEY} - compression: gzip - datadog_metrics: - type: datadog_metrics - inputs: - - datadog_agents.metrics - default_api_key: ${DD_API_KEY} - datadog_traces: - type: datadog_traces - inputs: - - datadog_agents.traces - default_api_key: ${DD_API_KEY} args: - run - --skip-key-validation diff --git a/charts/observability-pipelines-worker/ci/remote-config.yaml b/charts/observability-pipelines-worker/ci/remote-config.yaml deleted file mode 100644 index 98c5c8342..000000000 --- a/charts/observability-pipelines-worker/ci/remote-config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -args: - - run - - --skip-key-validation -datadog: - remoteConfigurationEnabled: true - pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" diff --git a/charts/observability-pipelines-worker/ci/serviceHeadless-disabled.yaml b/charts/observability-pipelines-worker/ci/serviceHeadless-disabled.yaml index e6804456f..333ef8b63 100644 --- a/charts/observability-pipelines-worker/ci/serviceHeadless-disabled.yaml +++ b/charts/observability-pipelines-worker/ci/serviceHeadless-disabled.yaml @@ -3,29 +3,6 @@ datadog: args: - run - --skip-key-validation -pipelineConfig: - sources: - datadog_agents: - address: 0.0.0.0:8282 - type: datadog_agent - multiple_outputs: true - sinks: - datadog_logs: - type: datadog_logs - inputs: - - datadog_agents.logs - default_api_key: ${DD_API_KEY} - compression: gzip - datadog_metrics: - type: datadog_metrics - inputs: - - datadog_agents.metrics - default_api_key: ${DD_API_KEY} - datadog_traces: - type: datadog_traces - inputs: - - datadog_agents.traces - default_api_key: ${DD_API_KEY} service: enabled: true serviceHeadless: diff --git a/charts/observability-pipelines-worker/ci/templated-config-values.yaml b/charts/observability-pipelines-worker/ci/templated-config-values.yaml deleted file mode 100644 index 32061d163..000000000 --- a/charts/observability-pipelines-worker/ci/templated-config-values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -datadog: - pipelineId: "8799b5cc-c2c9-4be5-9660-f97a4eede7f7" -args: - - run - - --skip-key-validation -pipelineConfig: - sources: - demo_logs: - type: demo_logs - format: json - sinks: - s3: - type: aws_s3 - inputs: [demo_logs] - bucket: logs-archive - key_prefix: >- - {{ print "{{kubernetes.pod_labels.\"app.kubernetes.io/client-id\"}}/%Y/%m/%d/{{kubernetes.pod_name}}/" }} - compression: gzip - encoding: - codec: json - region: us-east-1 diff --git a/charts/observability-pipelines-worker/templates/_pod.tpl b/charts/observability-pipelines-worker/templates/_pod.tpl index 31b0ba0a7..a646f7553 100644 --- a/charts/observability-pipelines-worker/templates/_pod.tpl +++ b/charts/observability-pipelines-worker/templates/_pod.tpl @@ -57,8 +57,6 @@ containers: - name: DD_OP_DATA_DIR value: {{ . | quote }} {{- end }} - - name: DD_OP_REMOTE_CONFIGURATION_ENABLED - value: {{ .Values.datadog.remoteConfigurationEnabled | quote }} - name: DD_OP_API_ENABLED value: {{ .Values.datadog.workerAPI.enabled | quote }} - name: DD_OP_API_PLAYGROUND @@ -74,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 }} @@ -95,11 +91,6 @@ containers: volumeMounts: - name: data mountPath: "{{ .Values.datadog.dataDir | default "/var/lib/observability-pipelines-worker" }}" - {{- if not .Values.datadog.remoteConfigurationEnabled }} - - name: config - mountPath: "/etc/observability-pipelines-worker/" - readOnly: true - {{- end }} {{- if .Values.extraVolumeMounts }} {{ toYaml .Values.extraVolumeMounts | indent 6 }} {{- end }} @@ -130,13 +121,6 @@ volumes: - name: data emptyDir: {} {{- end }} -{{- if not .Values.datadog.remoteConfigurationEnabled }} - - name: config - projected: - sources: - - configMap: - name: {{ template "opw.fullname" . }} -{{- end }} {{- if .Values.extraVolumes }} {{ toYaml .Values.extraVolumes | indent 2 }} {{- end }} diff --git a/charts/observability-pipelines-worker/templates/configmap.yaml b/charts/observability-pipelines-worker/templates/configmap.yaml deleted file mode 100644 index ea70044c5..000000000 --- a/charts/observability-pipelines-worker/templates/configmap.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if not .Values.datadog.remoteConfigurationEnabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "opw.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: {{ include "opw.labels" . | nindent 4 }} - annotations: - checksum/config: {{ tpl (toYaml .Values.pipelineConfig) . | sha256sum }} -data: - {{- if .Values.pipelineConfig }} - pipeline.yaml: | {{ tpl (toYaml .Values.pipelineConfig) . | nindent 4 }} - {{- else }} -{{ fail "A `pipelineConfig` must be specified, see https://docs.datadoghq.com/observability_pipelines/reference for all options" }} - {{- end -}} -{{- end }} diff --git a/charts/observability-pipelines-worker/templates/statefulset.yaml b/charts/observability-pipelines-worker/templates/statefulset.yaml index 1d7ebea5b..34d765a3a 100644 --- 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 index b882888d1..e0d212d48 100644 --- a/charts/observability-pipelines-worker/values.yaml +++ b/charts/observability-pipelines-worker/values.yaml @@ -30,8 +30,6 @@ datadog: site: datadoghq.com # datadog.dataDir -- The data directory for OPW to store runtime data in. dataDir: "/var/lib/observability-pipelines-worker" - # datadog.remoteConfigurationEnabled -- Whether to allow remote configuration of the worker from Datadog. - remoteConfigurationEnabled: false workerAPI: # datadog.workerAPI.enabled -- Whether to enable the Worker's API. enabled: false @@ -44,7 +42,7 @@ image: # image.name -- Specify the image name to use (relative to `image.repository`). name: observability-pipelines-worker # image.tag -- Specify the image tag to use. - tag: 1.8.0 + tag: 2.0.0 # image.digest -- (string) Specify the image digest to use; takes precedence over `image.tag`. digest: ## Currently, we offer images at: @@ -254,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: []