From a944a6ebafe968b03a214506d190c69f429e9929 Mon Sep 17 00:00:00 2001 From: Cedric Lamoriniere Date: Tue, 30 Jul 2019 15:26:51 +0200 Subject: [PATCH] [stable/datadog] Fix several aspect of KSM integration (#15908) * [stable/datadog] Fix error in readme configuration parameter * Fixes #15526. `rbac.serviceAccount` should be `rbac.serviceAccountName` in configuration parameter table * Update kube-state-metrics deps to 2.0.0 * bump stable/datadog chart to 1.32.0 Signed-off-by: cedric lamoriniere --- stable/datadog/Chart.yaml | 2 +- stable/datadog/README.md | 5 +++-- stable/datadog/requirements.lock | 6 +++--- stable/datadog/requirements.yaml | 2 +- stable/datadog/values.yaml | 18 ++++++++++++------ 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 41c4117903..95d1b1e082 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 1.31.11 +version: 1.32.0 appVersion: 6.12.1 description: DataDog Agent keywords: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index a5f0c47090..28f57c32ff 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -225,7 +225,7 @@ helm install --name \ | `nameOverride` | Override name of app | `nil` | | `fullnameOverride` | Override full name of app | `nil` | | `rbac.create` | If true, create & use RBAC resources | `true` | -| `rbac.serviceAccount` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` | +| `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` | | `daemonset.podLabels` | labels to add to each pod | `nil` | | `datadog.name` | Container name if Daemonset or Deployment | `datadog` | | `datadog.site` | Site ('datadoghq.com' or 'datadoghq.eu') | `nil` | @@ -294,7 +294,8 @@ helm install --name \ | `deployment.priorityClassName` | Which Priority Class to associate with the deployment | `nil` | | `kubeStateMetrics.enabled` | If true, create kube-state-metrics | `true` | | `kube-state-metrics.rbac.create` | If true, create & use RBAC resources for kube-state-metrics | `true` | -| `kube-state-metrics.rbac.serviceAccount` | existing ServiceAccount to use (ignored if rbac.create=true) for kube-state-metrics | `default` | +| `kube-state-metrics.serviceAccount.create` | If true, create & use serviceAccount | `true` | +| `kube-state-metrics.serviceAccount.name` | If not set & create is true, use template fullname | | | `clusterAgent.enabled` | Use the cluster-agent for cluster metrics (Kubernetes 1.10+ only) | `false` | | `clusterAgent.token` | A cluster-internal secret for agent-to-agent communication. Must be 32+ characters a-zA-Z | Generates a random value | | `clusterAgent.containerName` | The container name for the Cluster Agent | `cluster-agent` | diff --git a/stable/datadog/requirements.lock b/stable/datadog/requirements.lock index 82c3189eac..30427e23ce 100644 --- a/stable/datadog/requirements.lock +++ b/stable/datadog/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: kube-state-metrics repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.16.0 -digest: sha256:0f9c623d315b30d1b0680cb0146e8740d866d8360eee2fc17d991401e724dfff -generated: 2019-04-01T16:43:29.032424+02:00 + version: 2.0.0 +digest: sha256:6ea066b494a2098bbd68567fa714b95f9be5d11c9c16e50db9e947fc96c60cb9 +generated: "2019-07-29T17:35:21.334241+02:00" diff --git a/stable/datadog/requirements.yaml b/stable/datadog/requirements.yaml index 9996bf51c4..fe0ba85b32 100644 --- a/stable/datadog/requirements.yaml +++ b/stable/datadog/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: kube-state-metrics - version: ~0.16.0 + version: ~2.0.0 repository: https://kubernetes-charts.storage.googleapis.com/ condition: kubeStateMetrics.enabled diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 1aab8b5654..5f129060a4 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -16,9 +16,9 @@ image: ## @param tag - string - required ## Define the Agent version to use. - ## Use 6.12.1-jmx to enable jmx fetch collection + ## Use 6.13.0-jmx to enable jmx fetch collection # - tag: 6.12.1 + tag: 6.13.0 ## @param pullPolicy - string - required ## The Kubernetes pull policy. @@ -401,10 +401,16 @@ kube-state-metrics: # create: true - ## @param serviceAccountName - string - required - ## Ignored if rbac.create is true - # - serviceAccountName: default + serviceAccount: + ## @param created - boolean - required + ## If true, create ServiceAccount, require rbac kube-state-metrics.rbac.create true + # + create: true + ## @param name - string - required + ## The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the fullname template + # + name: daemonset: