From deb6f88ef3f7231bcf410462ff2ae53e986dbdc4 Mon Sep 17 00:00:00 2001 From: Danny Eiselt Date: Tue, 17 Oct 2023 15:02:51 +0200 Subject: [PATCH 1/3] Updates renovate.conf - split regex matchers for use with and without 'v' prefix Signed-off-by: Danny Eiselt --- .github/renovate.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index fb75c565..df9e4d17 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,17 +2,29 @@ "commitBody": "Signed-off-by: SCS Renovate Bot ", "gitAuthor": "SCS Renovate Bot ", "dependencyDashboard": "true", + "commitMessagePrefix": "renovate", "enabledManagers": ["regex"], "regexManagers":[ { + "description": "Regex used to match versions without prefix 'v'. Example: capi, capo.", "fileMatch":[ - "^terraform\\/variables.tf","^doc\\/configuration.md" + "^terraform\\/variables.tf","^doc\\/configuration.md","^terraform\\/environments\\/environment-default.tfvars" ], "matchStrings":[ - "default\\s*= \"(?.*?)\"\\s*# renovate: datasource=(?.*?) depName=(?.*?)\n", - ".\\|\\s*`(?.*?)`\\s*" + "`(?(\\d+\\.){1,2}(x|\\d+))`\\s*", + "default\\s*= \"(?(\\d+\\.){1,2}(x|\\d+))\"\\s*# renovate: datasource=(?.*?) depName=(?.*?)\n" ], "extractVersionTemplate": "^v(?.*)$" + }, + { + "description": "Regex used to match versions with prefix 'v'. Example: calico.", + "fileMatch":[ + "^terraform\\/variables.tf","^doc\\/configuration.md","^terraform\\/environments\\/environment-default.tfvars" + ], + "matchStrings":[ + "`(?v(\\d+\\.){1,2}(x|\\d+))`\\s*", + "default\\s*= \"(?v(\\d+\\.){1,2}(x|\\d+))\"\\s*# renovate: datasource=(?.*?) depName=(?.*?)\n" + ] } ] } From 7e753cb6c91eafd66be57dce533ed5139ba678e3 Mon Sep 17 00:00:00 2001 From: Danny Eiselt Date: Tue, 17 Oct 2023 15:07:50 +0200 Subject: [PATCH 2/3] Include calico in renovate Signed-off-by: Danny Eiselt --- doc/configuration.md | 2 +- terraform/variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/configuration.md b/doc/configuration.md index badcfd37..baed8b4f 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -47,7 +47,7 @@ Parameters controlling the cluster creation: | `pod_cidr` | `POD_CIDR` | SCS | `192.168.0.0/16` | IPv4 address range (CIDR notation) for pods | | `service_cidr` | `SERVICE_CIDR` | SCS | `10.96.0.0/12` | IPv4 address range (CIDR notation) for services | | `use_cilium` | `USE_CILIUM` | SCS | `true` | Use cilium as CNI instead of calico, it can be set to vX.Y.Z and `true` results in `v1.14.1`, also see `cilium_binaries` | -| `calico_version` | `CALICO_VERSION` | SCS | `v3.26.1` | Version of the Calico CNI provider (ignored if `use_cilium` is set) | +| `calico_version` | `CALICO_VERSION` | SCS | `v3.26.1` | Version of the Calico CNI provider (ignored if `use_cilium` is set) | | `kubernetes_version` | `KUBERNETES_VERSION` | capo | `v1.27.x` | Kubernetes version deployed into workload cluster (`.x` means latest patch release) | | `` | `OPENSTACK_IMAGE_NAME` | capo | `ubuntu-capi-image-${KUBERNETES_VERION}` | Image name for k8s controller and worker nodes. Ubuntu 22.04 image is used for k8s versions >= 1.27.3, 1.26.6, 1.25.11, Ubuntu 20.04 otherwise. | | `kube_image_raw` | `OPENSTACK_IMAGE_RAW` | SCS | `true` | Register images in raw format (instead of qcow2), good for ceph COW | diff --git a/terraform/variables.tf b/terraform/variables.tf index dcbe5abb..8653b4f9 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -61,7 +61,7 @@ variable "ssh_username" { variable "calico_version" { description = "desired version of calico" type = string - default = "v3.26.1" + default = "v3.26.1" # renovate: datasource=github-releases depName=projectcalico/calico } variable "clusterapi_version" { From c532c19ef8acefcfdada3577bc8cf25b5140feaa Mon Sep 17 00:00:00 2001 From: Danny Eiselt Date: Tue, 17 Oct 2023 15:13:51 +0200 Subject: [PATCH 3/3] removes renovate commit prefix Signed-off-by: Danny Eiselt --- .github/renovate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index df9e4d17..07a2f18d 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,7 +2,6 @@ "commitBody": "Signed-off-by: SCS Renovate Bot ", "gitAuthor": "SCS Renovate Bot ", "dependencyDashboard": "true", - "commitMessagePrefix": "renovate", "enabledManagers": ["regex"], "regexManagers":[ {