Merge branch 'support-registryUrl-in-renovate-config' into 'main'

feat: support helm repository annotation for renovate

See merge request gitlab-com/gl-infra/common-ci-tasks!139

renovate-bot.md

@@ -53,6 +53,17 @@ variables:
 Renovate supports multiple datasources: <https://docs.renovatebot.com/modules/datasource/>, giving flexibility in how new versions are looked up.
+### Using `registryUrl` for Helm Chart Renovate Annotations
+
+When annotating for [`helm`](https://docs.renovatebot.com/modules/datasource/#helm-datasource) dependency updates, the special `registryUrl=https://chart/url` syntax can be added to the annotation to allow to configure the appropriate Helm repository to query.
+
+For example, the following annotation can be used for the `kube-prometheus-stack` Helm chart.
+
+```yaml
+# datasource=helm depName=kube-prometheus-stack registryUrl=https://prometheus-community.github.io/helm-charts
+```
+
+More details can be found in <https://github.com/renovatebot/renovate/issues/6130>.
 ### Example Annotations
@@ -72,6 +83,7 @@ For convenience, here are some common annotations that can be cut-and-pasted int
 | `jb` | `# datasource=github-releases depName=jsonnet-bundler/jsonnet-bundler` |
 | `jq` | `# datasource=github-releases depName=stedolan/jq` |
 | `jsonnet-tool` | `# datasource=gitlab-releases depName=gitlab-com/gl-infra/jsonnet-tool` |
+| `kube-prometheus-stack` | `# datasource=helm depName=kube-prometheus-stack registryUrl=https://prometheus-community.github.io/helm-charts` |
 | `kubectl` | `# datasource=github-releases depName=kubernetes/kubernetes` |
 | `nodejs` | `# datasource=node depName=nodejs/node` |
 | `pmv` | `# datasource=gitlab-releases depName=gitlab-com/gl-infra/pmv` |

renovate-common.json

@@ -28,7 +28,7 @@
         "^.tool-versions$"
       ],
       "matchStrings": [
-        "\\s+(?<currentValue>\\S+)\\s*#\\s*datasource=(?<datasource>\\S+)\\s+depName=(?<depName>\\S+)(\\s+versioning=(?<versioning>\\S+))?\\s*\\n"
+        "\\s+(?<currentValue>\\S+)\\s*#\\s*datasource=(?<datasource>\\S+)\\s+depName=(?<depName>\\S+)(\\s+versioning=(?<versioning>\\S+))?(\\s+registryUrl=(?<registryUrl>\\S+))?\\s*\\n"
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     },
@@ -37,7 +37,7 @@
         "^.gitlab-ci-other-versions.yml$"
       ],
       "matchStrings": [
-        "\\s+\"?(?<currentValue>[a-zA-Z0-9._-]+)\"?\\s*#\\s*datasource=(?<datasource>\\S+)\\s+depName=(?<depName>\\S+)(\\s+versioning=(?<versioning>\\S+))?\\s*"
+        "\\s+\"?(?<currentValue>[a-zA-Z0-9._-]+)\"?\\s*#\\s*datasource=(?<datasource>\\S+)\\s+depName=(?<depName>\\S+)(\\s+versioning=(?<versioning>\\S+))?(\\s+registryUrl=(?<registryUrl>\\S+))?\\s*"
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     }