From 596d07ffffe39761094135709e9e6e1a8f1e4de0 Mon Sep 17 00:00:00 2001 From: Cedric Lamoriniere Date: Mon, 16 Nov 2020 16:03:10 +0100 Subject: [PATCH] Add 'datadog-crds' chart as 'datadog' dependency (#96) --- .github/ct.yaml | 1 + .github/workflows/ci.yaml | 2 ++ charts/datadog/CHANGELOG.md | 5 +++++ charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 4 +++- charts/datadog/requirements.lock | 7 +++++-- charts/datadog/requirements.yaml | 6 ++++++ charts/datadog/values.yaml | 5 +++++ 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/ct.yaml b/.github/ct.yaml index cab623f92..0dbfdbe20 100644 --- a/.github/ct.yaml +++ b/.github/ct.yaml @@ -1,5 +1,6 @@ chart-repos: - stable=https://charts.helm.sh/stable + - datadog=https://helm.datadoghq.com helm-extra-args: --timeout 300s check-version-increment: true debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e829f57c2..54921a413 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,6 +40,8 @@ jobs: uses: actions/checkout@v1 - name: Add default helm repo run: helm repo add stable https://charts.helm.sh/stable && helm repo update + - name: Add datadog helm repo + run: helm repo add datadog https://helm.datadoghq.com && helm repo update - name: Run kubeval env: KUBERNETES_VERSION: ${{ matrix.k8s }} diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index de3205db8..08c869d7e 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,6 +1,11 @@ # Datadog changelog +## 2.5.3 + +* Add "datadog-crds" chart as dependency. It is used to install the `DatadogMetrics` CRD if needed. + ## 2.5.2 + * Change `datadog.tags` to a `tpl` value ## 2.5.0 diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index bc30ea0f5..615c88551 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.5.2 +version: 2.5.3 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index e0a442b21..b25337295 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 2.5.2](https://img.shields.io/badge/Version-2.5.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 2.5.3](https://img.shields.io/badge/Version-2.5.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/kubernetes/charts/tree/master/stable/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/). @@ -29,6 +29,7 @@ Kubernetes 1.4+ or OpenShift 3.4+, note that: | Repository | Name | Version | |------------|------|---------| | https://charts.helm.sh/stable | kube-state-metrics | =2.8.11 | +| https://helm.datadoghq.com | datadog-crds | =0.1.1 | ## Quick start @@ -429,6 +430,7 @@ helm install --name \ | clusterChecksRunner.tolerations | list | `[]` | Tolerations for pod assignment | | clusterChecksRunner.volumeMounts | list | `[]` | Specify additional volumes to mount in the cluster checks container | | clusterChecksRunner.volumes | list | `[]` | Specify additional volumes to mount in the cluster checks container | +| datadog-crds.crds.datadogMetrics | bool | `true` | Set to true to deploy the DatadogMetrics CRD | | datadog.apiKey | string | `""` | Your Datadog API key ref: https://app.datadoghq.com/account/settings#agent/kubernetes | | datadog.apiKeyExistingSecret | string | `nil` | Use existing Secret which stores API key instead of creating a new one | | datadog.apm.enabled | bool | `false` | Enable this to enable APM and tracing, on port 8126 | diff --git a/charts/datadog/requirements.lock b/charts/datadog/requirements.lock index 726154acb..c8f47eb72 100644 --- a/charts/datadog/requirements.lock +++ b/charts/datadog/requirements.lock @@ -1,6 +1,9 @@ dependencies: +- name: datadog-crds + repository: https://helm.datadoghq.com + version: 0.1.1 - name: kube-state-metrics repository: https://charts.helm.sh/stable version: 2.8.11 -digest: sha256:e72aef3e78bbdd838ec25870ee899db9c2500b7da8c0ca8ec435d02880c47366 -generated: "2020-11-05T15:20:36.9037656Z" +digest: sha256:35c5ec4a7c5610cf2ff63bcd609293f8d2f8ac4bbc6e07462b9d66251b81b069 +generated: "2020-11-16T14:56:38.28858+01:00" diff --git a/charts/datadog/requirements.yaml b/charts/datadog/requirements.yaml index 30a43801a..6f81c4fad 100644 --- a/charts/datadog/requirements.yaml +++ b/charts/datadog/requirements.yaml @@ -1,4 +1,10 @@ dependencies: + - name: datadog-crds + version: "=0.1.1" + repository: https://helm.datadoghq.com + condition: clusterAgent.metricsProvider.useDatadogMetrics + tags: + - install-crds - name: kube-state-metrics version: "=2.8.11" repository: https://charts.helm.sh/stable diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml index a7b2268e1..a99e1311c 100644 --- a/charts/datadog/values.yaml +++ b/charts/datadog/values.yaml @@ -991,6 +991,11 @@ clusterChecksRunner: # clusterChecksRunner.securityContext -- Allows you to overwrite the default PodSecurityContext on the clusterchecks pods. securityContext: {} +datadog-crds: + crds: + # datadog-crds.crds.datadogMetrics -- Set to true to deploy the DatadogMetrics CRD + datadogMetrics: true + kube-state-metrics: rbac: # kube-state-metrics.rbac.create -- If true, create & use RBAC resources