From 566eae7d9417c0e981904b220355b3d83ae8e79c Mon Sep 17 00:00:00 2001 From: treydock Date: Tue, 31 May 2022 11:02:19 -0400 Subject: [PATCH] Fix handling of kyverno-policies version check when port in image tag (#4042) * Fix handling of kyverno-policies version check when port in image tag Fixes #4031 Signed-off-by: Trey Dockendorf * Add release notes for chart Signed-off-by: Trey Dockendorf * Fix release notes and use splitList Signed-off-by: Trey Dockendorf --- charts/kyverno-policies/Chart.yaml | 2 ++ charts/kyverno-policies/templates/_helpers.tpl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/kyverno-policies/Chart.yaml b/charts/kyverno-policies/Chart.yaml index d2dcd56a92..bf54afc11a 100644 --- a/charts/kyverno-policies/Chart.yaml +++ b/charts/kyverno-policies/Chart.yaml @@ -25,3 +25,5 @@ annotations: artifacthub.io/changes: | - kind: added description: Support for artifacthub.io/changes annotation + - kind: fixed + description: Fix Kyverno version check when image tag contains registry port number diff --git a/charts/kyverno-policies/templates/_helpers.tpl b/charts/kyverno-policies/templates/_helpers.tpl index 5ec06ce086..e74b260f5b 100644 --- a/charts/kyverno-policies/templates/_helpers.tpl +++ b/charts/kyverno-policies/templates/_helpers.tpl @@ -59,7 +59,7 @@ helm.sh/chart: {{ template "kyverno-policies.chart" . }} {{- $version := "" -}} {{- with (lookup "apps/v1" "Deployment" .Release.Namespace "kyverno") -}} {{- with (first .spec.template.spec.containers) -}} - {{- $imageTag := (split ":" .image)._1 -}} + {{- $imageTag := (last (splitList ":" .image)) -}} {{- $version = trimPrefix "v" $imageTag -}} {{- end -}} {{- end -}}