Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.13 Backports 2024-02-20 #30865

Merged
merged 5 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/aws/k8s-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ include:
- version: "1.23"
region: ca-west-1
- version: "1.24"
region: us-west-1
region: ca-west-1
- version: "1.25"
region: us-east-2
region: us-west-2
- version: "1.26"
region: ca-central-1
region: us-west-1
default: true
1 change: 1 addition & 0 deletions .github/actions/azure/k8s-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include:
- version: "1.25"
location: westus3
index: 1
disabled: true
- version: "1.26"
location: westus2
index: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/gke/k8s-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ k8s:
zone: us-west2-a
vmIndex: 1
- version: "1.25"
zone: us-west3-a
zone: us-west1-b
vmIndex: 2
- version: "1.26"
zone: us-east4-b
zone: us-west2-c
vmIndex: 3
default: true
3 changes: 3 additions & 0 deletions .github/ariane-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
allowed-teams:
- organization-members

triggers:
/test-backport-1.13:
workflows:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conformance-aks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
# main -> event_name = schedule
# other stable branches -> PR-number starting with v (e.g. v1.14)
if [[ "${{ github.event_name }}" == "schedule" || "${{ inputs.PR-number }}" == v* ]];then
cp azure.json /tmp/matrix.json
jq '{ "include": [ .include[] | select(.disabled==null) ] }' azure.json > /tmp/matrix.json
else
jq '{ "include": [ .include[] | select(.default) ] }' azure.json > /tmp/matrix.json
fi
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/net-perf-gke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: Network performance GKE
on:
schedule:
- cron: '39 0 * * 1-5'
# For testing uncomment following lines:
# push:
# branches:
# - your_branch_name

# By specifying the access of one of the scopes, all of those that are not
# specified are set to 'none'.
Expand Down Expand Up @@ -53,7 +57,7 @@ jobs:
include:
- index: 1
name: "native"
mode: "native"
mode: "gke"
encryption: "none"
hubble: "false"

Expand All @@ -65,7 +69,7 @@ jobs:

- index: 3
name: "native-ipsec"
mode: "native"
mode: "gke"
encryption: "ipsec"
hubble: "false"

Expand All @@ -77,7 +81,7 @@ jobs:

- index: 5
name: "native-hubble"
mode: "native"
mode: "gke"
encryption: "none"
hubble: "true"

Expand All @@ -89,7 +93,7 @@ jobs:

- index: 7
name: "native-ipsec-hubble"
mode: "native"
mode: "gke"
encryption: "ipsec"
hubble: "true"

Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@
# after the less specific paths, otherwise the ownership for the specific paths
# is not properly picked up in Github.
* @cilium/tophat
/.github/ariane-config.yaml @cilium/github-sec @cilium/ci-structure
/.github/workflows/ @cilium/github-sec @cilium/ci-structure
/api/ @cilium/api
/api/v1/Makefile @cilium/sig-hubble-api
Expand Down