diff --git a/lib/modules/manager/flux/__fixtures__/helmOCIRelease.yaml b/lib/modules/manager/flux/__fixtures__/helmOCIRelease.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..99eb6c33723aaefa39b9331da1dcf9289733eac7
--- /dev/null
+++ b/lib/modules/manager/flux/__fixtures__/helmOCIRelease.yaml
@@ -0,0 +1,16 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+ name: arc-assets
+ namespace: dev
+spec:
+ interval: 30m
+ chart:
+ spec:
+ chart: actions-runner-controller-charts/gha-runner-scale-set
+ version: 0.4.0
+ sourceRef:
+ kind: HelmRepository
+ name: actions-runner-controller
+ namespace: flux-system
+ interval: 30m
diff --git a/lib/modules/manager/flux/__fixtures__/helmOCIRelease2.yaml b/lib/modules/manager/flux/__fixtures__/helmOCIRelease2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..411497075bd0d31206227b4547200a83bf3fc1b7
--- /dev/null
+++ b/lib/modules/manager/flux/__fixtures__/helmOCIRelease2.yaml
@@ -0,0 +1,19 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+ name: kyverno
+ namespace: flux-system
+spec:
+ interval: 6h
+ releaseName: kyverno
+ targetNamespace: kyverno
+ install:
+ createNamespace: true
+ chart:
+ spec:
+ chart: kyverno
+ version: 2.6.0
+ interval: 6h
+ sourceRef:
+ kind: HelmRepository
+ name: kyverno
diff --git a/lib/modules/manager/flux/__fixtures__/helmOCISource.yaml b/lib/modules/manager/flux/__fixtures__/helmOCISource.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a96a5a406f86924be9e5c94c34ebd1a721304aea
--- /dev/null
+++ b/lib/modules/manager/flux/__fixtures__/helmOCISource.yaml
@@ -0,0 +1,10 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+ name: actions-runner-controller
+ namespace: flux-system
+spec:
+ type: oci
+ interval: 30m
+ url: oci://ghcr.io/actions
+ timeout: 3m
diff --git a/lib/modules/manager/flux/__fixtures__/helmOCISource2.yaml b/lib/modules/manager/flux/__fixtures__/helmOCISource2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7588d8f6810f1893f564079967cb0fcda285a73c
--- /dev/null
+++ b/lib/modules/manager/flux/__fixtures__/helmOCISource2.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+ name: kyverno
+ namespace: flux-system
+spec:
+ interval: 6h
+ url: oci://ghcr.io/kyverno/charts
diff --git a/lib/modules/manager/flux/extract.spec.ts b/lib/modules/manager/flux/extract.spec.ts
index f14307c3cc62c964681ca1c0d5ba262858eaf4e5..2775ec921276461b4354885c9d1bf5adcb2124c5 100644
--- a/lib/modules/manager/flux/extract.spec.ts
+++ b/lib/modules/manager/flux/extract.spec.ts
@@ -728,6 +728,49 @@ describe('modules/manager/flux/extract', () => {
]);
});
+ it('should handle HelmRepository with type OCI', async () => {
+ const result = await extractAllPackageFiles(config, [
+ 'lib/modules/manager/flux/__fixtures__/helmOCISource.yaml',
+ 'lib/modules/manager/flux/__fixtures__/helmOCIRelease.yaml',
+ ]);
+ expect(result).toEqual([
+ {
+ deps: [
+ {
+ currentValue: '0.4.0',
+ datasource: DockerDatasource.id,
+ depName: 'actions-runner-controller-charts/gha-runner-scale-set',
+ packageName:
+ 'ghcr.io/actions/actions-runner-controller-charts/gha-runner-scale-set',
+ },
+ ],
+ packageFile:
+ 'lib/modules/manager/flux/__fixtures__/helmOCIRelease.yaml',
+ },
+ ]);
+ });
+
+ it('should handle HelmRepository w/o type oci and url starts with oci', async () => {
+ const result = await extractAllPackageFiles(config, [
+ 'lib/modules/manager/flux/__fixtures__/helmOCISource2.yaml',
+ 'lib/modules/manager/flux/__fixtures__/helmOCIRelease2.yaml',
+ ]);
+ expect(result).toEqual([
+ {
+ deps: [
+ {
+ currentValue: '2.6.0',
+ datasource: DockerDatasource.id,
+ depName: 'kyverno',
+ packageName: 'ghcr.io/kyverno/charts/kyverno',
+ },
+ ],
+ packageFile:
+ 'lib/modules/manager/flux/__fixtures__/helmOCIRelease2.yaml',
+ },
+ ]);
+ });
+
it('ignores files that do not exist', async () => {
const result = await extractAllPackageFiles(config, [
'lib/modules/manager/flux/__fixtures__/bogus.yaml',
diff --git a/lib/modules/manager/flux/extract.ts b/lib/modules/manager/flux/extract.ts
index a15f5aa486fba16cdfc234752479e5acf44810fa..5713498c6999f1490994e57e72955a72b710cbe0 100644
--- a/lib/modules/manager/flux/extract.ts
+++ b/lib/modules/manager/flux/extract.ts
@@ -1,8 +1,10 @@
+import is from '@sindresorhus/is';
import { loadAll } from 'js-yaml';
import { logger } from '../../../logger';
import { readLocalFile } from '../../../util/fs';
import { regEx } from '../../../util/regex';
import { BitbucketTagsDatasource } from '../../datasource/bitbucket-tags';
+import { DockerDatasource } from '../../datasource/docker';
import { GitRefsDatasource } from '../../datasource/git-refs';
import { GitTagsDatasource } from '../../datasource/git-tags';
import { GithubReleasesDatasource } from '../../datasource/github-releases';
@@ -181,7 +183,29 @@ function resolveResourceManifest(
resource.metadata?.namespace)
);
if (matchingRepositories.length) {
- dep.registryUrls = matchingRepositories.map((repo) => repo.spec.url);
+ dep.registryUrls = matchingRepositories
+ .map((repo) => {
+ if (
+ repo.spec.type === 'oci' ||
+ repo.spec.url.startsWith('oci://')
+ ) {
+ // Change datasource to Docker
+ dep.datasource = DockerDatasource.id;
+ // Ensure the URL is a valid OCI path
+ dep.packageName = `${repo.spec.url.replace('oci://', '')}/${
+ resource.spec.chart.spec.chart
+ }`;
+ return null;
+ } else {
+ return repo.spec.url;
+ }
+ })
+ .filter(is.string);
+
+ // if registryUrls is empty, delete it from dep
+ if (!dep.registryUrls?.length) {
+ delete dep.registryUrls;
+ }
} else {
dep.skipReason = 'unknown-registry';
}
diff --git a/lib/modules/manager/flux/readme.md b/lib/modules/manager/flux/readme.md
index f8d9b60bd96bf22836ea146af481963d4da766af..55af102a1d4998e80ebda7cfcc18a54ccbbce81c 100644
--- a/lib/modules/manager/flux/readme.md
+++ b/lib/modules/manager/flux/readme.md
@@ -9,8 +9,8 @@ This manager parses [Flux](https://fluxcd.io/) YAML manifests and supports:
Extracts `helm` dependencies from `HelmRelease` resources.
-The `flux` manager only extracts `helm` dependencies for `HelmRelease` resources linked to `HelmRepository` or `GitRepository` sources.
-Renovate does not support OCI `HelmRepository` sources, those with `type: oci`.
+The `flux` manager extracts `helm` dependencies for `HelmRelease` resources linked to `HelmRepository` or `GitRepository` sources.
+Renovate does support OCI `HelmRepository` sources, those with `type: oci`.
In addition, for the `flux` manager to properly link `HelmRelease` and `HelmRepository` resources, _both_ of the following conditions must be met:
diff --git a/lib/modules/manager/flux/types.ts b/lib/modules/manager/flux/types.ts
index 7b18af8fdcddb005d034b9e4ae4c3a214427b4c6..9895abc28b29e6f81a1bf51695df775254afde8c 100644
--- a/lib/modules/manager/flux/types.ts
+++ b/lib/modules/manager/flux/types.ts
@@ -30,10 +30,13 @@ export interface HelmRelease extends KubernetesResource {
};
}
+export type HelmRepositoryType = 'oci' | 'default';
+
export interface HelmRepository extends KubernetesResource {
kind: 'HelmRepository';
spec: {
url: string;
+ type: HelmRepositoryType;
};
}