From 0df5e75f9bcd97f99224a57faca201cd59959600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Wed, 20 May 2020 12:24:18 +0200 Subject: [PATCH] [stable/datadog] Allow pre-release versions as docker image tag (#22457) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See http://masterminds.github.io/sprig/semver.html#working-with-prerelease-versions Signed-off-by: Lénaïc Huard --- stable/datadog/CHANGELOG.md | 4 ++++ stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/_helpers.tpl | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md index e134ab9fce..64f7d0961d 100644 --- a/stable/datadog/CHANGELOG.md +++ b/stable/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 2.3.3 + +* Allow pre-release versions as docker image tag + ## 2.3.2 * Update the DCA RBAC to allow it to create events in the HPA diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 03d7c29910..4807e02272 100644 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.3.2 +version: 2.3.3 appVersion: "7" description: Datadog Agent keywords: diff --git a/stable/datadog/templates/_helpers.tpl b/stable/datadog/templates/_helpers.tpl index 91e61818ff..c9a82810b4 100644 --- a/stable/datadog/templates/_helpers.tpl +++ b/stable/datadog/templates/_helpers.tpl @@ -13,7 +13,7 @@ {{- if and (eq $length 1) (eq $version "latest") -}} {{- $version = "7.19.0" -}} {{- end -}} -{{- if not (semverCompare "^6.19.0 || ^7.19.0" $version) -}} +{{- if not (semverCompare "^6.19.0-0 || ^7.19.0-0" $version) -}} {{- fail "This version of the chart requires an agent image 7.19.0 or greater. If you want to force and skip this check, use `--set agents.image.doNotCheckTag=true`" -}} {{- end -}} {{- end -}}