From 012ba100ed6b8bb1c9c31ca89f8b9429ab8c7f89 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Thu, 10 Oct 2024 15:47:45 +0200 Subject: [PATCH] Fix eks git version pattern --- charts/datadog/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datadog/templates/_helpers.tpl b/charts/datadog/templates/_helpers.tpl index 4d72addb4..cac84a0ca 100644 --- a/charts/datadog/templates/_helpers.tpl +++ b/charts/datadog/templates/_helpers.tpl @@ -934,7 +934,7 @@ Create RBACs for custom resources Return true if container runtime is known to discard uncompressed layers */}} {{- define "should-support-discard-uncompressed-layers" -}} - {{- if or .Values.datadog.sbom.containerImage.uncompressedLayersSupport .Values.datadog.sbom.containerImage.overlayFSDirectScan (and .Values.datadog.sbom.containerImage.enabled (or (contains "-gke." .Capabilities.KubeVersion.GitVersion) (contains "-eks." .Capabilities.KubeVersion.GitVersion))) -}} + {{- if or .Values.datadog.sbom.containerImage.uncompressedLayersSupport .Values.datadog.sbom.containerImage.overlayFSDirectScan (and .Values.datadog.sbom.containerImage.enabled (or (contains "-gke." .Capabilities.KubeVersion.GitVersion) (contains "-eks-" .Capabilities.KubeVersion.GitVersion))) -}} {{- if not (eq (include "should-enable-container-image-collection" .) "true") -}} {{- fail "Container runtime support has to be enabled for SBOM collection to work. Please enable it using `datadog.containerRuntimeSupport.enabled`." -}} {{- end -}}