diff --git a/.github/renovate/folders/charts.json5 b/.github/renovate/folders/charts.json5 deleted file mode 100644 index ae1859cc384..00000000000 --- a/.github/renovate/folders/charts.json5 +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/helm.json5", - "github>truecharts/public//.github/renovate/kinds/helm-values.json5" - ] -} diff --git a/.github/renovate/folders/clusters.json5 b/.github/renovate/folders/clusters.json5 deleted file mode 100644 index 9a6a78be423..00000000000 --- a/.github/renovate/folders/clusters.json5 +++ /dev/null @@ -1,11 +0,0 @@ - -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/flux.json5", - "github>truecharts/public//.github/renovate/kinds/helm-values.json5", - "github>truecharts/public//.github/renovate/kinds/docker.json5", - "github>truecharts/public//.github/renovate/special/talconfig.json5", - "github>truecharts/public//.github/renovate/special/customClusterManagers.json5" - ] -} \ No newline at end of file diff --git a/.github/renovate/folders/clustertool.json5 b/.github/renovate/folders/clustertool.json5 deleted file mode 100644 index 74f5c13ac77..00000000000 --- a/.github/renovate/folders/clustertool.json5 +++ /dev/null @@ -1,10 +0,0 @@ - -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/go.json5", - "github>truecharts/public//.github/renovate/kinds/flux.json5", - "github>truecharts/public//.github/renovate/kinds/docker.json5", - "github>truecharts/public//.github/renovate/special/talconfig.json5" - ] -} \ No newline at end of file diff --git a/.github/renovate/folders/containers.json5 b/.github/renovate/folders/containers.json5 deleted file mode 100644 index 92c688b5b0d..00000000000 --- a/.github/renovate/folders/containers.json5 +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/docker.json5" - ] -} \ No newline at end of file diff --git a/.github/renovate/folders/github.json5 b/.github/renovate/folders/github.json5 deleted file mode 100644 index c056b8a75a8..00000000000 --- a/.github/renovate/folders/github.json5 +++ /dev/null @@ -1,8 +0,0 @@ - -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/githubactions.json5", - "github>truecharts/public//.github/renovate/kinds/docker.json5" - ] -} \ No newline at end of file diff --git a/.github/renovate/folders/repositories.json5 b/.github/renovate/folders/repositories.json5 deleted file mode 100644 index 57824f08ebc..00000000000 --- a/.github/renovate/folders/repositories.json5 +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/flux.json5" - ] -} \ No newline at end of file diff --git a/.github/renovate/folders/website.json5 b/.github/renovate/folders/website.json5 deleted file mode 100644 index ce39481dac7..00000000000 --- a/.github/renovate/folders/website.json5 +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>truecharts/public//.github/renovate/kinds/astro.json5" - ] -} \ No newline at end of file diff --git a/.github/renovate/kinds/astro.json5 b/.github/renovate/kinds/astro.json5 index 5dceb9dce40..e576c66acd9 100644 --- a/.github/renovate/kinds/astro.json5 +++ b/.github/renovate/kinds/astro.json5 @@ -1,21 +1,20 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - // Astro project Renovate configuration for managing dependencies - "astro": { + "website": { "fileMatch": [ - "astro\\.config\\.(mjs|js|ts)$", // Matches Astro configuration files - "package\\.json$" // Matches package.json files for dependency management + "(^|/)website/.+/astro\\.config\\.(mjs|js|ts)$", // Matches Astro config files in /website and any subdirectory + "(^|/)website/.+/package\\.json$" // Matches package.json files in /website and any subdirectory ], - "enabled": true, // Enable updates for Astro dependencies - "commitMessageSuffix": "fix: update Astro dependencies", // Customize commit message suffix - "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types + "enabled": true, // Enable updates for website dependencies + "commitMessageSuffix": "fix: update website dependencies", // Customize commit message suffix + "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types "ignore": [ // Specify any dependencies or versions to ignore ], - "semanticCommitScope": "astro", + "semanticCommitScope": "website" }, "ignoreDeps": [ // List any dependencies to ignore globally if needed ], - "requiredStatusChecks": null, -} \ No newline at end of file + "requiredStatusChecks": null +} diff --git a/.github/renovate/kinds/docker.json5 b/.github/renovate/kinds/docker.json5 index 56b75a19130..6100ecd107f 100644 --- a/.github/renovate/kinds/docker.json5 +++ b/.github/renovate/kinds/docker.json5 @@ -7,7 +7,9 @@ "docker-compose\\.ya?ml$", // Matches docker-compose files "docker-compose\\.ya?ml\\.j2$", // Matches Jinja2 templated docker-compose files "\\.github/workflows/.*\\.ya?ml$", // Matches all workflow YAML files - "\\.github/workflows/.*\\.ya?ml\\.j2$" // Matches Jinja2 templated workflow files + "\\.github/workflows/.*\\.ya?ml\\.j2$", // Matches Jinja2 templated workflow files + "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$", + "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$" ], "enabled": true, // Enable Docker image updates "commitMessageSuffix": "fix: update Docker image", // Customize commit message suffix diff --git a/.github/renovate/kinds/flux.json5 b/.github/renovate/kinds/flux.json5 index bf7adbe7ba6..7b0c0b0224e 100644 --- a/.github/renovate/kinds/flux.json5 +++ b/.github/renovate/kinds/flux.json5 @@ -3,7 +3,8 @@ "flux": { "fileMatch": [ - ".ya?ml(?:\\.j2)?$" // Matches all .yaml and .yml files, optionally with a .j2 extension + "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$", + "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$" ], "enabled": true, // Enable Flux updates "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types diff --git a/.github/renovate/kinds/helm-values.json5 b/.github/renovate/kinds/helm-values.json5 index 72428ca728c..4a2a7500eda 100644 --- a/.github/renovate/kinds/helm-values.json5 +++ b/.github/renovate/kinds/helm-values.json5 @@ -3,7 +3,9 @@ "helm-values": { "fileMatch": [ - ".ya?ml(?:\\.j2)?$" // Matches all .yaml and .yml files, optionally with a .j2 extension + "(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$", + "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$", + "(^|/)charts/.+\\.ya?ml(?:\\.j2)?$", ], "enabled": true, // Enable image reference updates in values.yaml "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types diff --git a/.github/renovate/kinds/helm.json5 b/.github/renovate/kinds/helm.json5 index fa1db5ee090..bc7cda9dff2 100644 --- a/.github/renovate/kinds/helm.json5 +++ b/.github/renovate/kinds/helm.json5 @@ -1,9 +1,9 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "$schema": "https://docs.renovatebot.com/renovate-schema.json", "helm": { "fileMatch": [ - "Chart\\.ya?ml(?:\\.j2)?$" // Matches Chart.yaml or Chart.yml files, optionally with a .j2 extension + ".+/Chart\\.ya?ml(?:\\.j2)?$" // Matches Chart.yaml or Chart.yml files, optionally with a .j2 extension ], "enabled": true, // Enable Helm chart updates "semanticCommitScope": "helm", @@ -13,5 +13,5 @@ "ignore": [ // Add any global ignores here if needed ], - "requiredStatusChecks": null, -} \ No newline at end of file + "requiredStatusChecks": null +} diff --git a/.github/renovate/main.json5 b/.github/renovate/main.json5 index 7d107d9a578..acba358b4c3 100644 --- a/.github/renovate/main.json5 +++ b/.github/renovate/main.json5 @@ -22,6 +22,13 @@ "github>truecharts/public//.github/renovate/updates/calver.json5", "github>truecharts/public//.github/renovate/basics/commitMessage.json5", "github>truecharts/public//.github/renovate/basics/labels.json5", + "github>truecharts/public//.github/renovate/kinds/astro.json5", + "github>truecharts/public//.github/renovate/kinds/docker.json5", + "github>truecharts/public//.github/renovate/kinds/flux.json5", + "github>truecharts/public//.github/renovate/kinds/githubactions.json5", + "github>truecharts/public//.github/renovate/kinds/go.json5", + "github>truecharts/public//.github/renovate/kinds/helm-values.json5", + "github>truecharts/public//.github/renovate/kinds/helm.json5", "github>truecharts/public//.github/renovate/special/groups.json5", "github>truecharts/public//.github/renovate/special/automerge.json5", "github>truecharts/public//.github/renovate/special/customRules.json5", @@ -30,55 +37,6 @@ ], // Main Renovate configuration that lists package rules for various paths "packageRules": [ - { - "paths": [".github/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/github.json5" - ] - }, - { - "paths": ["charts/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/charts.json5" - ] - }, - { - "paths": ["containers/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/containers.json5" - ] - }, - { - "paths": ["clusters/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/clusters.json5" - ] - }, - { - "paths": ["repositories/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/repositories.json5" - ] - }, - { - "paths": ["clustertool/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/clustertool.json5" - ] - }, - { - "paths": ["website/**"], // Adjusted path - "enabled": true, - "extends": [ - "github>truecharts/public//.github/renovate/folders/website.json5" - ] - } ], "ignoreDeps": [ // List any dependencies to ignore globally if needed