From 54058e07978345d6468ac19c9baba996ab515d73 Mon Sep 17 00:00:00 2001 From: Patrick Lee Scott Date: Sat, 29 Aug 2026 15:54:57 -0500 Subject: [PATCH 1/7] fix: automate tested dependency updates --- .github/workflows/on-pr.yaml | 2 +- examples/istiostacks/standard.yaml | 1 + functions/render/000-state-init.yaml.gotmpl | 1 + renovate.json | 52 ++++++++++++++------- tests/test-render/main.k | 3 ++ upbound.yaml | 2 +- 6 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index 503e759..b4b3242 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -10,7 +10,7 @@ on: - reopened - synchronize paths: - - ".github/workflows/on-pr.yaml" + - ".github/workflows/**" - ".gitops/**" - "apis/**" - "examples/**" diff --git a/examples/istiostacks/standard.yaml b/examples/istiostacks/standard.yaml index 6b1d96e..c133e3b 100644 --- a/examples/istiostacks/standard.yaml +++ b/examples/istiostacks/standard.yaml @@ -8,6 +8,7 @@ spec: labels: team: platform namespace: istio-system + # renovate: datasource=helm depName=base registryUrl=https://istio-release.storage.googleapis.com/charts chartVersion: "1.29.2" ingressGateway: diff --git a/functions/render/000-state-init.yaml.gotmpl b/functions/render/000-state-init.yaml.gotmpl index e107ca3..57840d4 100644 --- a/functions/render/000-state-init.yaml.gotmpl +++ b/functions/render/000-state-init.yaml.gotmpl @@ -13,6 +13,7 @@ {{- $name := $metadata.name | default "istio" }} {{- $clusterName := $spec.clusterName | default $name }} {{- $namespace := $spec.namespace | default "istio-system" }} +# renovate: datasource=helm depName=base registryUrl=https://istio-release.storage.googleapis.com/charts {{- $chartVersion := $spec.chartVersion | default "1.29.2" }} {{- $managementPolicies := $spec.managementPolicies | default (list "*") }} diff --git a/renovate.json b/renovate.json index e571b8c..5e12177 100644 --- a/renovate.json +++ b/renovate.json @@ -12,10 +12,20 @@ }, "packageRules": [ { - "description": "Automerge minor and patch updates that pass all checks", - "matchUpdateTypes": ["minor", "patch"], + "description": "Automerge minor and patch updates after all checks pass", + "matchUpdateTypes": [ + "minor", + "patch" + ], "automerge": true }, + { + "description": "Require manual review for major updates", + "matchUpdateTypes": [ + "major" + ], + "automerge": false + }, { "description": "Disable automatic updates for all hops-ops Docker images", "matchDatasources": [ @@ -27,7 +37,7 @@ ] }, { - "description": "Group all AWS provider packages together for batched updates", + "description": "Group AWS provider-family packages", "matchPackageNames": [ "/provider-family-aws/", "/provider-aws-.*/" @@ -88,19 +98,29 @@ }, { "customType": "regex", - "fileMatch": ["\\.yaml\\.gotmpl$"], - "matchStrings": [ - "\\s*chart:\\s*name:\\s+(?.*?)\\s*repository:\\s*(?.*?)\\s*version:\\s*\"?(?.*?)\"?\\s" + "description": "Annotated runtime dependencies in schemas, templates, examples, and tests", + "managerFilePatterns": [ + "apis/**/*.yaml", + "examples/**/*.yaml", + "functions/**/*.yaml.gotmpl", + "tests/**/*.k" ], - "datasourceTemplate": "helm" - }, - { - "customType": "regex", - "fileMatch": ["\\.gitops/deploy/Chart\\.yaml$"], - "matchStrings": ["appVersion:\\s+(?.*)"], - "depNameTemplate": "base", - "registryUrlTemplate": "https://istio-release.storage.googleapis.com/charts", - "datasourceTemplate": "helm" + "matchStrings": [ + "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s+|:=\\s*|[\"']?(?:version|chartVersion|tag|default)[\"']?\\s*(?:[=:]\\s*|\\s+))[\"']?(?v?[0-9][^\\s\"'}]*)", + "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s+|[\"']?image[\"']?\\s*[=:]\\s*)[\"']?[A-Za-z0-9._/-]+:(?v?[A-Za-z0-9][^\\s\"'}]*)", + "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?package\\s*=\\s*\"[^\"]+:(?[^\"]+)\"" + ] } - ] + ], + "ignorePaths": [ + "**/node_modules/**", + "**/bower_components/**", + "**/vendor/**", + "**/__tests__/**", + "**/test/**", + "**/__fixtures__/**" + ], + "automergeType": "pr", + "platformAutomerge": false, + "ignoreTests": false } diff --git a/tests/test-render/main.k b/tests/test-render/main.k index b34cd91..f789410 100644 --- a/tests/test-render/main.k +++ b/tests/test-render/main.k @@ -34,6 +34,7 @@ _items = [ chart = { name = "base" repository = "https://istio-release.storage.googleapis.com/charts" + # renovate: datasource=helm depName=base registryUrl=https://istio-release.storage.googleapis.com/charts version = "1.29.2" } namespace = "istio-system" @@ -45,6 +46,7 @@ _items = [ metadata.name = "test-istiod" spec.forProvider = { chart.name = "istiod" + # renovate: datasource=helm depName=base registryUrl=https://istio-release.storage.googleapis.com/charts chart.version = "1.29.2" namespace = "istio-system" values = { @@ -59,6 +61,7 @@ _items = [ metadata.name = "test-ztunnel" spec.forProvider = { chart.name = "ztunnel" + # renovate: datasource=helm depName=base registryUrl=https://istio-release.storage.googleapis.com/charts chart.version = "1.29.2" namespace = "istio-system" values.resources.requests = {cpu = "35m", memory = "100Mi"} diff --git a/upbound.yaml b/upbound.yaml index 1c6d62c..6c23a42 100644 --- a/upbound.yaml +++ b/upbound.yaml @@ -15,7 +15,7 @@ spec: - apiVersion: pkg.crossplane.io/v1 kind: Function package: xpkg.crossplane.io/crossplane-contrib/function-auto-ready - version: '>=v0.7.0' + version: '>=v0' description: Installs Istio (base, istiod, gateways) via Helm with a minimal, stable interface. license: Apache-2.0 From 6c9f2475d28991a70058b131becc3a127e1d8e6b Mon Sep 17 00:00:00 2001 From: Patrick Lee Scott Date: Sat, 29 Aug 2026 16:59:07 -0500 Subject: [PATCH 2/7] fix: bound dependencies below next major --- renovate.json | 16 ++++++++++++---- upbound.yaml | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/renovate.json b/renovate.json index 5e12177..dbf3d6e 100644 --- a/renovate.json +++ b/renovate.json @@ -71,30 +71,38 @@ { "customType": "regex", "description": "hops-ops Crossplane configurations (tracked via GitHub Releases)", + "matchStringsStrategy": "recursive", "managerFilePatterns": [ "apis/**/configuration.yaml", "upbound.yaml" ], "matchStrings": [ - "\\s*(configuration|function|package|provider):\\s*ghcr\\.io/hops-ops/(?.*?)\\s*version:\\s*(\"|')>=(?.*?)(\"|')\\s*" + "\\s*(configuration|function|package|provider):\\s*ghcr\\.io/hops-ops/(?.*?)\\s*version:\\s*(\"|')>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*=v{{{newMajor}}} [^/]+)\\/(?[^/]+)\\/(?[^/\\s]+)\\s*version:\\s*(\"|')>=(?.*?)(\"|')\\s*" + "\\s*(configuration|function|package|provider):\\s*(?[^/]+)\\/(?[^/]+)\\/(?[^/\\s]+)\\s*version:\\s*(\"|')>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*=v{{{newMajor}}} =v1' + version: '>=v1 =v1' + version: '>=v1 =v0' + version: '>=v0 Date: Sat, 29 Aug 2026 17:10:42 -0500 Subject: [PATCH 3/7] fix: avoid overlapping Renovate extraction --- renovate.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index dbf3d6e..ed826e0 100644 --- a/renovate.json +++ b/renovate.json @@ -87,14 +87,14 @@ }, { "customType": "regex", - "description": "Crossplane packages from other registries (tracked via Docker tags)", + "description": "Crossplane packages from xpkg registries (tracked via Docker tags)", "matchStringsStrategy": "recursive", "managerFilePatterns": [ "apis/**/configuration.yaml", "upbound.yaml" ], "matchStrings": [ - "\\s*(configuration|function|package|provider):\\s*(?[^/]+)\\/(?[^/]+)\\/(?[^/\\s]+)\\s*version:\\s*(\"|')>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*xpkg\\.[^/]+)\\/(?[^/]+)\\/(?[^/\\s]+)\\s*version:\\s*(\"|')>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s+|:=\\s*|[\"']?(?:version|chartVersion|tag|default)[\"']?\\s*(?:[=:]\\s*|\\s+))[\"']?(?v?[0-9][^\\s\"'}]*)", - "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s+|[\"']?image[\"']?\\s*[=:]\\s*)[\"']?[A-Za-z0-9._/-]+:(?v?[A-Za-z0-9][^\\s\"'}]*)", + "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?[\"']?image[\"']?\\s*[=:]\\s*[\"']?[A-Za-z0-9._/-]+:(?v?[A-Za-z0-9][^\\s\"'}]*)", "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?package\\s*=\\s*\"[^\"]+:(?[^\"]+)\"" ] } From 66031910e4bd3b6de0139c53db76407f5b6d9f6e Mon Sep 17 00:00:00 2001 From: Patrick Lee Scott Date: Sat, 29 Aug 2026 17:24:36 -0500 Subject: [PATCH 4/7] fix: address dependency review findings --- README.md | 6 +++--- renovate.json | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e0f30ed..d60f552 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ Deletion protection (Usages) ensures correct teardown order: gateways before ist - Crossplane installed in the cluster - Crossplane providers: - - `provider-helm` (>=v1.0.6) - - `provider-kubernetes` (>=v0.15.0) — only needed when using `egress.allowedHosts` + - `provider-helm` (>=v1 =v1 =v0.6.0) + - `function-auto-ready` (>=v0 \\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s+|:=\\s*|[\"']?(?:version|chartVersion|tag|default)[\"']?\\s*(?:[=:]\\s*|\\s+))[\"']?(?v?[0-9][^\\s\"'}]*)", - "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?[\"']?image[\"']?\\s*[=:]\\s*[\"']?[A-Za-z0-9._/-]+:(?v?[A-Za-z0-9][^\\s\"'}]*)", + "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s*:\\s*|[\"']?image[\"']?\\s*[=:]\\s*)[\"']?[A-Za-z0-9._/-]+:(?v?[A-Za-z0-9][^\\s\"'}]*)", "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?package\\s*=\\s*\"[^\"]+:(?[^\"]+)\"" ] } @@ -126,7 +126,8 @@ "**/vendor/**", "**/__tests__/**", "**/test/**", - "**/__fixtures__/**" + "**/__fixtures__/**", + "**/fixtures/**" ], "automergeType": "pr", "platformAutomerge": false, From b51779f9af4425afed2b67f855f66a80276131de Mon Sep 17 00:00:00 2001 From: Patrick Lee Scott Date: Sat, 29 Aug 2026 17:25:56 -0500 Subject: [PATCH 5/7] fix: scope package dependency extraction --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 48dfb54..36c04df 100644 --- a/renovate.json +++ b/renovate.json @@ -116,7 +116,7 @@ "matchStrings": [ "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s+|:=\\s*|[\"']?(?:version|chartVersion|tag|default)[\"']?\\s*(?:[=:]\\s*|\\s+))[\"']?(?v?[0-9][^\\s\"'}]*)", "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?(?:default\\s*:\\s*|[\"']?image[\"']?\\s*[=:]\\s*)[\"']?[A-Za-z0-9._/-]+:(?v?[A-Za-z0-9][^\\s\"'}]*)", - "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?package\\s*=\\s*\"[^\"]+:(?[^\"]+)\"" + "# renovate: datasource=(?\\S+) depName=(?\\S+)(?: registryUrl=(?\\S+))?\\s+[^\\n]*?package\\s*=\\s*\"xpkg\\.[^/]+/[^\"]+:(?[^\"]+)\"" ] } ], From 36d1345253985715e477241cd41613176c1c98bd Mon Sep 17 00:00:00 2001 From: Patrick Lee Scott Date: Sat, 29 Aug 2026 17:30:11 -0500 Subject: [PATCH 6/7] fix: validate Renovate configuration changes --- .github/workflows/on-pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index b4b3242..da66980 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -10,6 +10,7 @@ on: - reopened - synchronize paths: + - 'renovate.json' - ".github/workflows/**" - ".gitops/**" - "apis/**" From f2793ac1f6115a3ff06414d4fb945bb7f2ec1388 Mon Sep 17 00:00:00 2001 From: Patrick Lee Scott Date: Sat, 29 Aug 2026 18:00:15 -0500 Subject: [PATCH 7/7] fix: use compatible major dependency ranges --- README.md | 6 +++--- renovate.json | 12 ++++++------ upbound.yaml | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d60f552..bc8c71f 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ Deletion protection (Usages) ensures correct teardown order: gateways before ist - Crossplane installed in the cluster - Crossplane providers: - - `provider-helm` (>=v1 =v1 =v0 .*?)\\s*version:\\s*(\"|')>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*.*?)\\s*version:\\s*(\"|')\\^v?[0-9]+(\"|')\\s*", + "(?\\^v?[0-9]+)" ], "datasourceTemplate": "github-releases", "versioningTemplate": "npm", "packageNameTemplate": "hops-ops/{{depName}}", - "autoReplaceStringTemplate": ">=v{{{newMajor}}} xpkg\\.[^/]+)\\/(?[^/]+)\\/(?[^/\\s]+)\\s*version:\\s*(\"|')>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*>=v?[0-9]+(?:\\.[0-9]+){0,2}(?:\\s*xpkg\\.[^/]+)\\/(?[^/]+)\\/(?[^/\\s]+)\\s*version:\\s*(\"|')\\^v?[0-9]+(\"|')\\s*", + "(?\\^v?[0-9]+)" ], "datasourceTemplate": "docker", "versioningTemplate": "npm", "registryUrlTemplate": "https://{{registryUrl}}", "depNameTemplate": "{{orgName}}/{{repoName}}", "packageNameTemplate": "{{orgName}}/{{repoName}}", - "autoReplaceStringTemplate": ">=v{{{newMajor}}} =v1 =v1 =v0