Merge branch 'main' into conformance-experimental

config/samples/controlplane.yaml

@@ -13,7 +13,7 @@ spec:
       spec:
         containers:
         - name: controller
-          # renovate: datasource=docker depName=kong/kubernetes-ingress-controller packageName=kong/kubernetes-ingress-controller versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kubernetes-ingress-controller:3.1.5
           readinessProbe:
             initialDelaySeconds: 1

config/samples/dataplane-bluegreen-rollout.yaml

@@ -13,7 +13,7 @@ spec:
       spec:
         containers:
         - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kong-gateway:3.6
           env:
           - name: KONG_LOG_LEVEL

config/samples/dataplane-horizontal-autoscaling.yaml

@@ -41,7 +41,7 @@ spec:
       spec:
         containers:
         - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kong-gateway:3.6
           env:
           - name: KONG_LOG_LEVEL

config/samples/dataplane-konnect.yaml

@@ -34,7 +34,7 @@ spec:
       spec:
         containers:
         - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kong-gateway:3.6
           env:
             - name: KONG_ROLE

config/samples/dataplane-sidecar.yaml

@@ -45,7 +45,7 @@ spec:
             initialDelaySeconds: 1
             periodSeconds: 1
         - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kong-gateway:3.6
           volumeMounts:
           - name: proxy-logs

config/samples/dataplane-with-custom-ports.yaml

@@ -13,7 +13,7 @@ spec:
       spec:
         containers:
         - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kong-gateway:3.6
           env:
           - name: KONG_LOG_LEVEL

config/samples/dataplane.yaml

@@ -13,7 +13,7 @@ spec:
       spec:
         containers:
         - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+          # renovate: datasource=docker versioning=docker
           image: kong/kong-gateway:3.6
           env:
           - name: KONG_LOG_LEVEL

config/samples/gateway-httproute.yaml

@@ -131,7 +131,7 @@ spec:
         spec:
           containers:
           - name: proxy
-          # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+            # renovate: datasource=docker versioning=docker
             image: kong/kong-gateway:3.6
             readinessProbe:
               initialDelaySeconds: 1
@@ -142,7 +142,7 @@ spec:
         spec:
           containers:
           - name: controller
-            # renovate: datasource=docker depName=kong/kubernetes-ingress-controller packageName=kong/kubernetes-ingress-controller versioning=docker
+            # renovate: datasource=docker versioning=docker
             image: kong/kubernetes-ingress-controller:3.1.5
             readinessProbe:
               initialDelaySeconds: 1

config/samples/gateway-with-gatewayconfiguration.yaml

@@ -16,7 +16,7 @@ spec:
         spec:
           containers:
           - name: proxy
-            # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+            # renovate: datasource=docker versioning=docker
             image: kong/kong-gateway:3.6
             readinessProbe:
               initialDelaySeconds: 1

config/samples/gatewayconfiguration.yaml

@@ -16,7 +16,7 @@ spec:
         spec:
           containers:
           - name: proxy
-            # renovate: datasource=docker depName=kong/kong-gateway packageName=kong/kong-gateway versioning=docker
+            # renovate: datasource=docker versioning=docker
             image: kong/kong-gateway:3.6
             readinessProbe:
               initialDelaySeconds: 1

renovate.json

@@ -3,6 +3,10 @@
   "extends": [
     "config:recommended"
   ],
+  "enabledManagers": [
+    "custom.regex",
+    "kustomize"
+  ],
   "automerge": false,
   "separateMinorPatch": true,
   "labels": [
@@ -11,13 +15,23 @@
   "schedule": "before 5am every weekday",
   "customManagers": [
     {
-      "description": "Match dependencies in config/samples/.*.yaml that are properly annotated with `# renovate: datasource={} depName={} [packageName={}] [registryUrl={}] versioning={}.`",
+      "description": "Match dependencies in config/samples/.*.yaml that are properly annotated with `# renovate: datasource={} versioning={}.`",
+      "customType": "regex",
+      "fileMatch": [
+        "^config/samples/.*\\.yaml$"
+      ],
+      "matchStrings": [
+        "#\\s+renovate:\\s+datasource=(?<datasource>.*)\\s+versioning=(?<versioning>.*?)\\n.+image:\\s+(?<depName>.+?):(?<currentValue>.+)"
+      ]
+    },
+    {
+      "description": "Match dependencies in .tools_verisons.yaml that are properly annotated with `# renovate: datasource={} depName={}.`",
       "customType": "regex",
       "fileMatch": [
-        "^config/samples/.*.yaml$"
+        "\\.tools_versions\\.yaml$"
       ],
       "matchStrings": [
-        "#\\s+renovate:\\s+datasource=(?<datasource>.*?)\\s+depName=(?<depName>.*?)\\s+(packageName=(?<packageName>.*)\\s+)?(registryUrl=(?<registryUrl>.*)\\s+)?versioning=(?<versioning>.*?)\\n.+'(?<currentValue>.*?)'"
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\n.+\"(?<currentValue>.*?)\""
       ]
     }
   ]