From 24143732b616bb6cd308564b0be33f13fc5613e6 Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Tue, 27 Jun 2023 13:02:38 -0700 Subject: [PATCH] Prepare for v1.15 development cycle Signed-off-by: Joe Stringer --- .github/maintainers-little-helper.yaml | 12 +++++++++- .github/renovate.json5 | 23 +++++++++++++++++++ .../workflows/ci-images-garbage-collect.yaml | 2 +- .github/workflows/loki.yaml | 7 ++++++ Documentation/contributing/testing/ci.rst | 2 ++ VERSION | 2 +- install/kubernetes/cilium/Chart.yaml | 4 ++-- install/kubernetes/cilium/README.md | 2 +- 8 files changed, 48 insertions(+), 6 deletions(-) diff --git a/.github/maintainers-little-helper.yaml b/.github/maintainers-little-helper.yaml index afd2db3d86ab3..1019d94b1defd 100644 --- a/.github/maintainers-little-helper.yaml +++ b/.github/maintainers-little-helper.yaml @@ -1,6 +1,16 @@ -project: "https://github.com/cilium/cilium/projects/226" +project: "https://github.com/cilium/cilium/projects/239" column: "In progress" move-to-projects-for-labels-xored: + v1.14: + needs-backport/1.14: + project: "https://github.com/cilium/cilium/projects/240" + column: "Needs backport from main" + backport-pending/1.14: + project: "https://github.com/cilium/cilium/projects/240" + column: "Backport pending to v1.14" + backport-done/1.14: + project: "https://github.com/cilium/cilium/projects/240" + column: "Backport done to v1.14" v1.13: needs-backport/1.13: project: "https://github.com/cilium/cilium/projects/236" diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a25a6a94fac54..4555151cb510f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -45,6 +45,7 @@ "pruneStaleBranches": true, "baseBranches": [ "main", + "v1.14", "v1.13", "v1.12", "v1.11" @@ -113,6 +114,7 @@ "go.sum" ], matchBaseBranches: [ + "v1.14", "v1.13", "v1.12", "v1.11" @@ -191,6 +193,7 @@ "allowedVersions": "22.04", "matchBaseBranches": [ "main", + "v1.14", "v1.13" ] }, @@ -213,6 +216,16 @@ "install/kubernetes/cilium/templates/spire/**" ], }, + { + "matchPackageNames": [ + "docker.io/library/golang", + "go" + ], + "allowedVersions": "<1.21", + "matchBaseBranches": [ + "v1.14" + ] + }, { "matchPackageNames": [ "docker.io/library/golang", @@ -245,6 +258,15 @@ "v1.11" ] }, + { + "matchPackageNames": [ + "docker.io/library/alpine" + ], + "allowedVersions": "<3.19", + "matchBaseBranches": [ + "v1.14", + ] + }, { "matchPackageNames": [ "docker.io/library/alpine" @@ -310,6 +332,7 @@ "golangci/golangci-lint" ], "matchBaseBranches": [ + "v1.14", "v1.13", "v1.12", "v1.11" diff --git a/.github/workflows/ci-images-garbage-collect.yaml b/.github/workflows/ci-images-garbage-collect.yaml index 7679cfbe7f01b..a84632a201b57 100644 --- a/.github/workflows/ci-images-garbage-collect.yaml +++ b/.github/workflows/ci-images-garbage-collect.yaml @@ -19,6 +19,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.9,origin/v1.10,origin/v1.11,origin/v1.12,origin/v1.13 + args: --git-repository=./ --stable-branches=origin/main,origin/v1.9,origin/v1.10,origin/v1.11,origin/v1.12,origin/v1.13,origin/v1.14 env: QUAY_TOKEN: ${{ secrets.SCRUFFY_QUAY_TOKEN }} diff --git a/.github/workflows/loki.yaml b/.github/workflows/loki.yaml index e9b0e78ebe923..5f524d81fac4b 100644 --- a/.github/workflows/loki.yaml +++ b/.github/workflows/loki.yaml @@ -14,26 +14,31 @@ on: - Cilium L4LB XDP (ci-l4lb-1.11) - Cilium L4LB XDP (ci-l4lb-1.12) - Cilium L4LB XDP (ci-l4lb-1.13) + - Cilium L4LB XDP (ci-l4lb-1.14) - Conformance AWS-CNI (ci-awscni) - Conformance AWS-CNI (ci-awscni-1.10) - Conformance AWS-CNI (ci-awscni-1.11) - Conformance AWS-CNI (ci-awscni-1.12) - Conformance AWS-CNI (ci-awscni-1.13) + - Conformance AWS-CNI (ci-awscni-1.14) - ConformanceAKS (ci-aks) - ConformanceAKS (ci-aks-1.10) - ConformanceAKS (ci-aks-1.11) - ConformanceAKS (ci-aks-1.12) - ConformanceAKS (ci-aks-1.13) + - ConformanceAKS (ci-aks-1.14) - ConformanceEKS (ci-eks) - ConformanceEKS (ci-eks-1.10) - ConformanceEKS (ci-eks-1.11) - ConformanceEKS (ci-eks-1.12) - ConformanceEKS (ci-eks-1.13) + - ConformanceEKS (ci-eks-1.14) - ConformanceGKE (ci-gke) - ConformanceGKE (ci-gke-1.10) - ConformanceGKE (ci-gke-1.11) - ConformanceGKE (ci-gke-1.12) - ConformanceGKE (ci-gke-1.13) + - ConformanceGKE (ci-gke-1.14) - ConformanceIngress - ConformanceIngress (Dedicated LB) - ConformanceIngress (Shared LB) @@ -45,6 +50,7 @@ on: - External workloads (ci-external-workloads-v1.11) - External workloads (ci-external-workloads-v1.12) - External workloads (ci-external-workloads-v1.13) + - External workloads (ci-external-workloads-v1.14) - Go-related checks - Hot Fix Image Release Build - Image CI Build @@ -55,6 +61,7 @@ on: - Multicluster / Cluster mesh (ci-multicluster-1.11) - Multicluster / Cluster mesh (ci-multicluster-1.12) - Multicluster / Cluster mesh (ci-multicluster-1.13) + - Multicluster / Cluster mesh (ci-multicluster-1.14) - Nightly - Scruffy - Smoke Test with IPv6 diff --git a/Documentation/contributing/testing/ci.rst b/Documentation/contributing/testing/ci.rst index d77b042e613b4..681dc4c0cd9ce 100644 --- a/Documentation/contributing/testing/ci.rst +++ b/Documentation/contributing/testing/ci.rst @@ -32,6 +32,8 @@ them all at once: +==================+==========================+ | main | /test | +------------------+--------------------------+ +| v1.14 | /test-backport-1.14 | ++------------------+--------------------------+ | v1.13 | /test-backport-1.13 | +------------------+--------------------------+ | v1.12 | /test-backport-1.12 | diff --git a/VERSION b/VERSION index 2f2e08cfa3bff..9a4866bbcedef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.0-dev +1.15.0-dev diff --git a/install/kubernetes/cilium/Chart.yaml b/install/kubernetes/cilium/Chart.yaml index e6e30721d4efd..0b52ab10ac4b8 100644 --- a/install/kubernetes/cilium/Chart.yaml +++ b/install/kubernetes/cilium/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: cilium displayName: Cilium home: https://cilium.io/ -version: 1.14.0-dev -appVersion: 1.14.0-dev +version: 1.15.0-dev +appVersion: 1.15.0-dev kubeVersion: ">= 1.16.0-0" icon: https://cdn.jsdelivr.net/gh/cilium/cilium@main/Documentation/images/logo-solo.svg description: eBPF-based Networking, Security, and Observability diff --git a/install/kubernetes/cilium/README.md b/install/kubernetes/cilium/README.md index 84963fac07d19..2ed2e9fe87000 100644 --- a/install/kubernetes/cilium/README.md +++ b/install/kubernetes/cilium/README.md @@ -1,6 +1,6 @@ # cilium -![Version: 1.14.0-dev](https://img.shields.io/badge/Version-1.14.0--dev-informational?style=flat-square) ![AppVersion: 1.14.0-dev](https://img.shields.io/badge/AppVersion-1.14.0--dev-informational?style=flat-square) +![Version: 1.15.0-dev](https://img.shields.io/badge/Version-1.15.0--dev-informational?style=flat-square) ![AppVersion: 1.15.0-dev](https://img.shields.io/badge/AppVersion-1.15.0--dev-informational?style=flat-square) Cilium is open source software for providing and transparently securing network connectivity and loadbalancing between application workloads such as