From 4ce27f5a763422f731f8cdf4b8527bcbca77d62f Mon Sep 17 00:00:00 2001
From: Johannes Feichtner <343448+Churro@users.noreply.github.com>
Date: Fri, 31 Mar 2023 05:47:46 +0200
Subject: [PATCH] fix(manager/kubernetes): allow trailing comments (#21260)
---
.../manager/kubernetes/__fixtures__/kubernetes.yaml | 4 ++++
lib/modules/manager/kubernetes/extract.spec.ts | 9 +++++++++
lib/modules/manager/kubernetes/extract.ts | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/lib/modules/manager/kubernetes/__fixtures__/kubernetes.yaml b/lib/modules/manager/kubernetes/__fixtures__/kubernetes.yaml
index b235413e45..b066dd5265 100644
--- a/lib/modules/manager/kubernetes/__fixtures__/kubernetes.yaml
+++ b/lib/modules/manager/kubernetes/__fixtures__/kubernetes.yaml
@@ -19,6 +19,10 @@ spec:
image: nginx:1.7.9
ports:
- containerPort: 80
+ - name: nginx2
+ image: nginx:1.22.1 # trailing comment
+ ports:
+ - containerPort: 8081
---
diff --git a/lib/modules/manager/kubernetes/extract.spec.ts b/lib/modules/manager/kubernetes/extract.spec.ts
index e7c6733a41..16fbd38e10 100644
--- a/lib/modules/manager/kubernetes/extract.spec.ts
+++ b/lib/modules/manager/kubernetes/extract.spec.ts
@@ -30,6 +30,15 @@ describe('modules/manager/kubernetes/extract', () => {
depName: 'nginx',
replaceString: 'nginx:1.7.9',
},
+ {
+ autoReplaceStringTemplate:
+ '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+ currentDigest: undefined,
+ currentValue: '1.22.1',
+ datasource: 'docker',
+ depName: 'nginx',
+ replaceString: 'nginx:1.22.1',
+ },
{
autoReplaceStringTemplate:
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
diff --git a/lib/modules/manager/kubernetes/extract.ts b/lib/modules/manager/kubernetes/extract.ts
index 633268f6a6..546d0fcee1 100644
--- a/lib/modules/manager/kubernetes/extract.ts
+++ b/lib/modules/manager/kubernetes/extract.ts
@@ -44,7 +44,7 @@ function extractImages(
const deps: PackageDependency[] = [];
for (const line of content.split(newlineRegex)) {
- const match = regEx(/^\s*-?\s*image:\s*'?"?([^\s'"]+)'?"?\s*$/).exec(line);
+ const match = regEx(/^\s*-?\s*image:\s*['"]?([^\s'"]+)['"]?\s*/).exec(line);
if (match) {
const currentFrom = match[1];
const dep = getDep(currentFrom, true, config.registryAliases);
--
GitLab