feat(helm-manager): allow either tag or version for images in helm ch…

…arts (#16058) * update Allow either tag or version for images in helm charts * undo * lint * undo * exports * rewrite * add spaces for lint * chore: prettier fix Co-authored-by: Rhys Arkins <rhys@arkins.net> Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · Jun 23, 2022 · 29a272c · 29a272c
1 parent ee52021
commit 29a272c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/lib/modules/manager/helm-values/extract.ts b/lib/modules/manager/helm-values/extract.ts
@@ -46,7 +46,7 @@ function findDependencies(
       let registry = currentItem.registry;
       registry = registry ? `${registry}/` : '';
       const repository = String(currentItem.repository);
-      const tag = String(currentItem.tag);
+      const tag = `${currentItem.tag ?? currentItem.version}`;
       packageDependencies.push(getHelmDep({ repository, tag, registry }));
     } else if (matchesHelmValuesInlineImage(key, value)) {
       packageDependencies.push(getDep(value));

diff --git a/lib/modules/manager/helm-values/readme.md b/lib/modules/manager/helm-values/readme.md
@@ -7,6 +7,10 @@ image:
   tag: v1.0.0
   registry: registry.example.com # optional key, will default to "docker.io"
 
+image:
+  repository: 'some-docker/dependency'
+  version: v1.0.0
+
 coreImage:
   registry: docker.io
   repository: bitnami/harbor-core

diff --git a/lib/modules/manager/helm-values/types.ts b/lib/modules/manager/helm-values/types.ts
@@ -1,5 +1,20 @@
-export type HelmDockerImageDependency = {
+export interface HelmDockerImageDependencyBasic {
   registry?: string;
   repository: string;
+}
+
+export interface HelmDockerImageDependencyTag
+  extends HelmDockerImageDependencyBasic {
   tag: string;
-};
+  version?: never;
+}
+
+export interface HelmDockerImageDependencyVersion
+  extends HelmDockerImageDependencyBasic {
+  version: string;
+  tag?: never;
+}
+
+export type HelmDockerImageDependency =
+  | HelmDockerImageDependencyTag
+  | HelmDockerImageDependencyVersion;
diff --git a/lib/modules/manager/helm-values/util.ts b/lib/modules/manager/helm-values/util.ts
@@ -15,6 +15,9 @@ const parentKeyRe = regEx(/image$/i);
  * image:
  *   repository: 'something'
  *   tag: v1.0.0
+ * image:
+ *   repository: 'something'
+ *   version: v1.0.0
  * renovateImage:
  *   repository: 'something'
  *   tag: v1.0.0
@@ -28,7 +31,7 @@ export function matchesHelmValuesDockerHeuristic(
     data &&
     typeof data === 'object' &&
     hasKey('repository', data) &&
-    hasKey('tag', data)
+    (hasKey('tag', data) || hasKey('version', data))
   );
 }