fix(manager/kubernetes): allow trailing comments (#21260)

renovatebot · Mar 31, 2023 · 4ce27f5 · 4ce27f5
1 parent 480cff5
commit 4ce27f5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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);