Skip to content

Commit

Permalink
Prepare for v1.15 development cycle
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Stringer <[email protected]>
  • Loading branch information
joestringer authored and aanm committed Jul 7, 2023
1 parent 751fc71 commit 2414373
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 6 deletions.
12 changes: 11 additions & 1 deletion .github/maintainers-little-helper.yaml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
23 changes: 23 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"pruneStaleBranches": true,
"baseBranches": [
"main",
"v1.14",
"v1.13",
"v1.12",
"v1.11"
Expand Down Expand Up @@ -113,6 +114,7 @@
"go.sum"
],
matchBaseBranches: [
"v1.14",
"v1.13",
"v1.12",
"v1.11"
Expand Down Expand Up @@ -191,6 +193,7 @@
"allowedVersions": "22.04",
"matchBaseBranches": [
"main",
"v1.14",
"v1.13"
]
},
Expand All @@ -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",
Expand Down Expand Up @@ -245,6 +258,15 @@
"v1.11"
]
},
{
"matchPackageNames": [
"docker.io/library/alpine"
],
"allowedVersions": "<3.19",
"matchBaseBranches": [
"v1.14",
]
},
{
"matchPackageNames": [
"docker.io/library/alpine"
Expand Down Expand Up @@ -310,6 +332,7 @@
"golangci/golangci-lint"
],
"matchBaseBranches": [
"v1.14",
"v1.13",
"v1.12",
"v1.11"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-images-garbage-collect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
7 changes: 7 additions & 0 deletions .github/workflows/loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Documentation/contributing/testing/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.0-dev
1.15.0-dev
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2414373

Please sign in to comment.