From e0deb89e33534948f8369c4c9c04234eb19e8540 Mon Sep 17 00:00:00 2001 From: Fahad Arshad Date: Wed, 4 Nov 2020 17:03:12 -0500 Subject: [PATCH 1/6] move kube-state-metrics sub-chart from google helm registry to charts.helm.sh/stable --- charts/datadog/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datadog/requirements.yaml b/charts/datadog/requirements.yaml index e0878a6d7..4887e8d20 100644 --- a/charts/datadog/requirements.yaml +++ b/charts/datadog/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: kube-state-metrics version: "=2.8.11" - repository: https://kubernetes-charts.storage.googleapis.com/ + repository: https://charts.helm.sh/stable/ condition: datadog.kubeStateMetricsEnabled From 0839a46449d0236b920f2e89c83e3200c1809129 Mon Sep 17 00:00:00 2001 From: Fahad Arshad Date: Wed, 4 Nov 2020 17:24:12 -0500 Subject: [PATCH 2/6] run helm-docs script --- charts/datadog/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 88edb940e..868247bd2 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -28,7 +28,7 @@ Kubernetes 1.4+ or OpenShift 3.4+, note that: | Repository | Name | Version | |------------|------|---------| -| https://kubernetes-charts.storage.googleapis.com/ | kube-state-metrics | =2.8.11 | +| https://charts.helm.sh/stable/ | kube-state-metrics | =2.8.11 | ## Quick start From 176db6a9f8af49b9a634853f82a572e2105a3a7f Mon Sep 17 00:00:00 2001 From: Fahad Arshad Date: Thu, 5 Nov 2020 08:36:38 -0500 Subject: [PATCH 3/6] updateing req.lock & adding new repo references to ct.yaml and ci.yaml --- .github/ct.yaml | 2 +- .github/workflows/ci.yaml | 2 +- charts/datadog/requirements.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ct.yaml b/.github/ct.yaml index 74ff0b986..cab623f92 100644 --- a/.github/ct.yaml +++ b/.github/ct.yaml @@ -1,5 +1,5 @@ chart-repos: - - stable=https://kubernetes-charts.storage.googleapis.com + - stable=https://charts.helm.sh/stable helm-extra-args: --timeout 300s check-version-increment: true debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9230a4b81..e829f57c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Add default helm repo - run: helm repo add stable https://kubernetes-charts.storage.googleapis.com && helm repo update + run: helm repo add stable https://charts.helm.sh/stable && helm repo update - name: Run kubeval env: KUBERNETES_VERSION: ${{ matrix.k8s }} diff --git a/charts/datadog/requirements.lock b/charts/datadog/requirements.lock index 8383fb3f2..9ed8b2a03 100644 --- a/charts/datadog/requirements.lock +++ b/charts/datadog/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: kube-state-metrics - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 2.8.11 -digest: sha256:ca16dbfb025e4fdd4f5665fc5adfd8f8cf62100cae882d1d94e32efd2e9ce156 -generated: "2020-10-19T18:49:38.132849+02:00" + repository: https://charts.helm.sh/stable/ + version: =2.8.11 +digest: sha256:d372a5a447b9bac65504ad41a7201c5e5a51a43aed27133712608ca3d6558bf7 +generated: "2020-11-05T13:30:35.0560537Z" From 080c6181ca67ab9005c69efd9aa2c89c4b615719 Mon Sep 17 00:00:00 2001 From: Fahad Arshad Date: Thu, 5 Nov 2020 08:52:56 -0500 Subject: [PATCH 4/6] rebased and updated chart version --- charts/datadog/CHANGELOG.md | 4 ++++ charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 338257164..2b9edecab 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 2.4.38 + +* Move the kube-state-metrics subchart from google's helm registry to charts.helm.sh/stable. + ## 2.4.37 * Fix incorrect link for Event Collection in `values.yaml`. diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index a8ffb2157..54fcf05fb 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.4.37 +version: 2.4.38 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 868247bd2..05be51ea8 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 2.4.37](https://img.shields.io/badge/Version-2.4.37-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 2.4.38](https://img.shields.io/badge/Version-2.4.38-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/). From fc7843018fb7f8cb0196045f006ac4aa4fb6572c Mon Sep 17 00:00:00 2001 From: Fahad Arshad Date: Thu, 5 Nov 2020 10:22:21 -0500 Subject: [PATCH 5/6] fix the helm error due to trailing forward slash --- charts/datadog/requirements.lock | 8 ++++---- charts/datadog/requirements.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/datadog/requirements.lock b/charts/datadog/requirements.lock index 9ed8b2a03..726154acb 100644 --- a/charts/datadog/requirements.lock +++ b/charts/datadog/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: kube-state-metrics - repository: https://charts.helm.sh/stable/ - version: =2.8.11 -digest: sha256:d372a5a447b9bac65504ad41a7201c5e5a51a43aed27133712608ca3d6558bf7 -generated: "2020-11-05T13:30:35.0560537Z" + repository: https://charts.helm.sh/stable + version: 2.8.11 +digest: sha256:e72aef3e78bbdd838ec25870ee899db9c2500b7da8c0ca8ec435d02880c47366 +generated: "2020-11-05T15:20:36.9037656Z" diff --git a/charts/datadog/requirements.yaml b/charts/datadog/requirements.yaml index 4887e8d20..30a43801a 100644 --- a/charts/datadog/requirements.yaml +++ b/charts/datadog/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: kube-state-metrics version: "=2.8.11" - repository: https://charts.helm.sh/stable/ + repository: https://charts.helm.sh/stable condition: datadog.kubeStateMetricsEnabled From e3ae132e8ed44d3f724a51386eb530bd65607443 Mon Sep 17 00:00:00 2001 From: Fahad Arshad Date: Thu, 5 Nov 2020 10:24:53 -0500 Subject: [PATCH 6/6] run helm-docs again --- charts/datadog/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datadog/README.md b/charts/datadog/README.md index 05be51ea8..00d2d216d 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -28,7 +28,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://charts.helm.sh/stable | kube-state-metrics | =2.8.11 | ## Quick start