feat(fleet): extract dependencies from helm blocks without a fixed re…

…leaseName (#28325)
renovatebot · Apr 10, 2024 · 7669f2f · 7669f2f
1 parent 0d79286
commit 7669f2f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/lib/modules/manager/fleet/__fixtures__/valid_fleet.yaml b/lib/modules/manager/fleet/__fixtures__/valid_fleet.yaml
@@ -14,4 +14,9 @@ helm:
   releaseName: logging-operator
   version: 3.17.7
   values:
-
+---
+defaultNamespace: monitoring
+helm:
+  repo: https://prometheus-community.github.io/helm-charts
+  chart: prometheus
+  version: 25.19.1
diff --git a/lib/modules/manager/fleet/extract.spec.ts b/lib/modules/manager/fleet/extract.spec.ts
@@ -61,6 +61,15 @@ kind: Fleet
             registryUrls: ['https://kubernetes-charts.banzaicloud.com'],
             depType: 'fleet',
           },
+          {
+            currentValue: '25.19.1',
+            datasource: 'helm',
+            depName: 'prometheus',
+            registryUrls: [
+              'https://prometheus-community.github.io/helm-charts',
+            ],
+            depType: 'fleet',
+          },
         ]);
       });
 

diff --git a/lib/modules/manager/fleet/schema.ts b/lib/modules/manager/fleet/schema.ts
@@ -4,13 +4,10 @@ const FleetHelmBlock = z.object({
   chart: z.string().optional(),
   repo: z.string().optional(),
   version: z.string().optional(),
+  releaseName: z.string().optional(),
 });
 export type FleetHelmBlock = z.infer<typeof FleetHelmBlock>;
 
-const FleetFileHelm = FleetHelmBlock.extend({
-  releaseName: z.string(),
-});
-
 /**
   Represent a GitRepo Kubernetes manifest of Fleet.
   @link https://fleet.rancher.io/gitrepo-add/#create-gitrepo-instance
@@ -32,7 +29,7 @@ export type GitRepo = z.infer<typeof GitRepo>;
  @link https://fleet.rancher.io/gitrepo-structure/#fleetyaml
  */
 export const FleetFile = z.object({
-  helm: FleetFileHelm,
+  helm: FleetHelmBlock,
   targetCustomizations: z
     .array(
       z.object({