Prepare for v1.16 development cycle

Signed-off-by: Joe Stringer <joe@cilium.io>
gandro · Dec 14, 2023 · 9b01690 · 9b01690
1 parent 65286ce
commit 9b01690
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 16 deletions.
diff --git a/.github/maintainers-little-helper.yaml b/.github/maintainers-little-helper.yaml
@@ -1,4 +1,14 @@
 move-to-projects-for-labels-xored:
+  v1.15:
+    needs-backport/1.15:
+      project: "https://github.com/cilium/cilium/projects/239"
+      column: "Needs backport from main"
+    backport-pending/1.15:
+      project: "https://github.com/cilium/cilium/projects/239"
+      column: "Backport pending to v1.15"
+    backport-done/1.15:
+      project: "https://github.com/cilium/cilium/projects/239"
+      column: "Backport done to v1.15"
   v1.14:
     needs-backport/1.14:
       project: "https://github.com/cilium/cilium/projects/255"

diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -52,6 +52,7 @@
   "pruneStaleBranches": true,
   "baseBranches": [
     "main",
+    "v1.15",
     "v1.14",
     "v1.13",
     "v1.12"
@@ -137,6 +138,7 @@
       ],
       matchBaseBranches: [
         "main",
+        "v1.15",
         "v1.14",
         "v1.13",
         "v1.12"
@@ -152,6 +154,7 @@
         "go.sum"
       ],
       matchBaseBranches: [
+        "v1.15",
         "v1.14",
         "v1.13",
         "v1.12"
@@ -259,6 +262,7 @@
       "allowedVersions": "22.04",
       "matchBaseBranches": [
         "main",
+        "v1.15",
         "v1.14",
         "v1.13"
       ],
@@ -286,9 +290,9 @@
         "docker.io/library/golang",
         "go"
       ],
-      "allowedVersions": "<1.21",
+      "allowedVersions": "<1.22",
       "matchBaseBranches": [
-        "v1.14"
+        "v1.15"
       ]
     },
     {
@@ -298,17 +302,18 @@
       ],
       "allowedVersions": "<1.21",
       "matchBaseBranches": [
-        "v1.13"
+        "v1.14",
+        "v1.13",
+        "v1.12"
       ]
     },
     {
       "matchPackageNames": [
-        "docker.io/library/golang",
-        "go"
+        "docker.io/library/alpine"
       ],
-      "allowedVersions": "<1.21",
+      "allowedVersions": "<3.20",
       "matchBaseBranches": [
-        "v1.12"
+        "v1.15"
       ]
     },
     {
@@ -351,6 +356,11 @@
       "matchDepNames": [
         "cilium/cilium-cli"
       ],
+      "matchBaseBranches": [
+        "main",
+        "v1.15",
+        "v1.14"
+      ]
     },
     {
       // Do not bump the minor version for Cilium <v1.14. Certain workflows
@@ -400,6 +410,7 @@
         "golangci/golangci-lint"
       ],
       "matchBaseBranches": [
+        "v1.15",
         "v1.14",
         "v1.13",
         "v1.12"

diff --git a/.github/workflows/ariane-scheduled.yaml b/.github/workflows/ariane-scheduled.yaml
@@ -21,6 +21,7 @@ jobs:
           - "1.12"
           - "1.13"
           - "1.14"
+          - "1.15"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch

diff --git a/.github/workflows/ci-images-garbage-collect.yaml b/.github/workflows/ci-images-garbage-collect.yaml
@@ -21,6 +21,6 @@ jobs:
         uses: docker://quay.io/cilium/scruffy:v0.0.3@sha256:ca997451b739cbf03c204cb2523a671c31c61edc606aa5d20dc3560bc7f25bc7
         with:
           entrypoint: scruffy
-          args: --git-repository=./ --stable-branches=origin/main,origin/v1.12,origin/v1.13,origin/v1.14
+          args: --git-repository=./ --stable-branches=origin/main,origin/v1.12,origin/v1.13,origin/v1.14,origin/v1.15
         env:
           QUAY_TOKEN: ${{ secrets.SCRUFFY_QUAY_TOKEN }}
diff --git a/.github/workflows/container-scan.yaml b/.github/workflows/container-scan.yaml
@@ -21,7 +21,7 @@ jobs:
           {name: kvstoremesh, dockerfile: ./images/kvstoremesh/Dockerfile},
           {name: operator-generic, dockerfile: ./images/operator/Dockerfile},
         ]
-        branch: [v1.12, v1.13, v1.14]
+        branch: [v1.12, v1.13, v1.14, v1.15]
         exclude:
           - image: {name: kvstoremesh, dockerfile: ./images/kvstoremesh/Dockerfile}
             branch: v1.12

diff --git a/Documentation/contributing/testing/ci.rst b/Documentation/contributing/testing/ci.rst
@@ -52,6 +52,8 @@ them all at once:
 +==================+==========================+
 | main             | /test                    |
 +------------------+--------------------------+
+| v1.15            | /test-backport-1.15      |
++------------------+--------------------------+
 | v1.14            | /test-backport-1.14      |
 +------------------+--------------------------+
 | v1.13            | /test-backport-1.13      |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.15.0-dev
+1.16.0-dev
diff --git a/install/kubernetes/cilium/Chart.yaml b/install/kubernetes/cilium/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: cilium
 displayName: Cilium
 home: https://cilium.io/
-version: 1.15.0-dev
-appVersion: 1.15.0-dev
-kubeVersion: ">= 1.16.0-0"
+version: 1.16.0-dev
+appVersion: 1.16.0-dev
+kubeVersion: ">= 1.26.0-0"
 icon: https://cdn.jsdelivr.net/gh/cilium/cilium@main/Documentation/images/logo-solo.svg
 description: eBPF-based Networking, Security, and Observability
 keywords:

diff --git a/install/kubernetes/cilium/README.md b/install/kubernetes/cilium/README.md
diff --git a/pkg/k8s/apis/cilium.io/register.go b/pkg/k8s/apis/cilium.io/register.go
@@ -15,5 +15,5 @@ const (
 	//
 	// Maintainers: Run ./Documentation/check-crd-compat-table.sh for each release
 	// Developers: Bump patch for each change in the CRD schema.
-	CustomResourceDefinitionSchemaVersion = "1.26.12"
+	CustomResourceDefinitionSchemaVersion = "1.29.0"
 )