From 70dda1730df45c7ae9aa3d378ebe0b59cd41dd30 Mon Sep 17 00:00:00 2001 From: Kornilios Kourtis Date: Mon, 29 Apr 2024 16:01:31 +0200 Subject: [PATCH 1/3] release_template: add item about updating renovate That is, when we create branch X.Y we need to enable renovate for this branch. Signed-off-by: Kornilios Kourtis --- .github/ISSUE_TEMPLATE/release_template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/release_template.md b/.github/ISSUE_TEMPLATE/release_template.md index 4e515094318..41b33956c68 100644 --- a/.github/ISSUE_TEMPLATE/release_template.md +++ b/.github/ISSUE_TEMPLATE/release_template.md @@ -37,6 +37,7 @@ assignees: '' - If release is `X.Y.0`: - [ ] Create `vX.Y` branch. + - [ ] Add this stable branch to [renovate.json5]()https://github.com/cilium/tetragon/blob/main/.github/renovate.json5 - [ ] Create a "Starting `X.Y+1` development" PR on the master branch with the following changes: - Update [CustomResourceDefinitionSchemaVersion](https://github.com/cilium/tetragon/blob/6f2809c51b3fbd35b1de0a178f1e3d0b18c52bcc/pkg/k8s/apis/cilium.io/v1alpha1/register.go#L18) to `X.Y+1.0`. - [ ] Once PR is merged, tag the first commit in master which is not in the `X.Y` branch as `vX.Y+1.0-pre.0`. The high level view of the status after this tag is shown in the following figure (RELEASE is `v0.10.0` in this example): From d181112b5e0e7953cba063e041825f70d2f427f2 Mon Sep 17 00:00:00 2001 From: Kornilios Kourtis Date: Mon, 29 Apr 2024 16:02:26 +0200 Subject: [PATCH 2/3] renovate: add v1.1 as a base branch Signed-off-by: Kornilios Kourtis --- .github/renovate.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index e00a3e3b5c4..172418df816 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -54,6 +54,7 @@ "baseBranches": [ "main", "v1.0", + "v1.1", ], "vulnerabilityAlerts": { "enabled": true From 01d3654153dd9c06910a067367b07931fd196968 Mon Sep 17 00:00:00 2001 From: Kornilios Kourtis Date: Mon, 29 Apr 2024 16:02:45 +0200 Subject: [PATCH 3/3] update CustomResourceDefinitionSchemaVersion We have branched 1.1, so update update CustomResourceDefinitionSchemaVersion to the new minor version 1.2. Signed-off-by: Kornilios Kourtis --- pkg/k8s/apis/cilium.io/v1alpha1/version.go | 2 +- .../cilium/tetragon/pkg/k8s/apis/cilium.io/v1alpha1/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/k8s/apis/cilium.io/v1alpha1/version.go b/pkg/k8s/apis/cilium.io/v1alpha1/version.go index dc8b58a087f..0f2a4026011 100644 --- a/pkg/k8s/apis/cilium.io/v1alpha1/version.go +++ b/pkg/k8s/apis/cilium.io/v1alpha1/version.go @@ -7,4 +7,4 @@ package v1alpha1 // Used to determine if CRD needs to be updated in cluster // // Developers: Bump patch for each change in the CRD schema. -const CustomResourceDefinitionSchemaVersion = "1.1.10" +const CustomResourceDefinitionSchemaVersion = "1.2.0" diff --git a/vendor/github.com/cilium/tetragon/pkg/k8s/apis/cilium.io/v1alpha1/version.go b/vendor/github.com/cilium/tetragon/pkg/k8s/apis/cilium.io/v1alpha1/version.go index dc8b58a087f..0f2a4026011 100644 --- a/vendor/github.com/cilium/tetragon/pkg/k8s/apis/cilium.io/v1alpha1/version.go +++ b/vendor/github.com/cilium/tetragon/pkg/k8s/apis/cilium.io/v1alpha1/version.go @@ -7,4 +7,4 @@ package v1alpha1 // Used to determine if CRD needs to be updated in cluster // // Developers: Bump patch for each change in the CRD schema. -const CustomResourceDefinitionSchemaVersion = "1.1.10" +const CustomResourceDefinitionSchemaVersion = "1.2.0"