feat(manager/helm-values): add image support in helm values manager

lib/modules/manager/helm-values/__fixtures__/values_with_image_instead_of_repo.yaml

@@ -0,0 +1,68 @@
+# Default values for test-chart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repo: nginx
+  tag: 1.16.1
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

lib/modules/manager/helm-values/extract.spec.ts

@@ -11,6 +11,10 @@ const helmMultiAndNestedImageValues = Fixtures.get(
   'multi_and_nested_image_values.yaml',
 );
 
+const helmImageInsteadOfRepository = Fixtures.get(
+  'values_with_image_instead_of_repo.yaml',
+);
+
 const config = partial<ExtractConfig>({});
 
 const configAliases = partial<ExtractConfig>({
@@ -108,5 +112,14 @@ describe('modules/manager/helm-values/extract', () => {
         ],
       });
     });
+
+    it('return null if image and repo are not defined', () => {
+      const result = extractPackageFile(
+        helmImageInsteadOfRepository,
+        packageFile,
+        config,
+      );
+      expect(result).toBeNull();
+    });
   });
 });

lib/modules/manager/helm-values/extract.ts

@@ -48,10 +48,16 @@
   Object.entries(parsedContent).forEach(([key, value]) => {
     if (matchesHelmValuesDockerHeuristic(key, value)) {
       const currentItem = value;
-
       let registry = currentItem.registry;
       registry = registry ? `${registry}/` : '';
-      const repository = String(currentItem.repository);
+      if (
+        currentItem.repository === undefined &&
+        currentItem.image === undefined
+      ) {
+        logger.debug('repository and image are both undefined');
+        return null;
+      }
+      const repository = `${currentItem.repository ?? currentItem.image}`;
       const tag = `${currentItem.tag ?? currentItem.version}`;
       packageDependencies.push(getHelmDep(registry, repository, tag, config));
     } else if (matchesHelmValuesInlineImage(key, value)) {

lib/modules/manager/helm-values/readme.md

@@ -11,6 +11,10 @@ image:
   repository: 'some-docker/dependency'
   version: v1.0.0
 
+image:
+  image: 'some-docker/dependency'
+  version: v1.0.0
+
 coreImage:
   registry: docker.io
   repository: bitnami/harbor-core

lib/modules/manager/helm-values/types.ts

@@ -1,6 +1,7 @@
 export interface HelmDockerImageDependencyBasic {
   registry?: string;
-  repository: string;
+  repository?: string;
+  image?: string;
 }
 
 export interface HelmDockerImageDependencyTag

lib/modules/manager/helm-values/util.ts

@@ -30,7 +30,7 @@ export function matchesHelmValuesDockerHeuristic(
     parentKeyRe.test(parentKey) &&
     data &&
     typeof data === 'object' &&
-    hasKey('repository', data) &&
+    (hasKey('repository', data) || hasKey('image', data)) &&
     (hasKey('tag', data) || hasKey('version', data))
   );
 }