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 2023-08-28 #27741

Merged
merged 4 commits into from
Sep 1, 2023
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
4 changes: 3 additions & 1 deletion .github/ariane-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ triggers:
/ci-awscni:
workflows:
- conformance-aws-cni.yaml
/ci-multicluster:
/ci-clustermesh:
workflows:
- conformance-clustermesh.yaml
/ci-e2e:
Expand Down Expand Up @@ -60,3 +60,5 @@ workflows:
paths-ignore-regex: (test|Documentation)/
tests-l4lb.yaml:
paths-regex: (bpf|daemon|images|pkg|test/l4lb|vendor)/
tests-ipsec-upgrade.yaml:
paths-ignore-regex: (test|Documentation)/
1 change: 1 addition & 0 deletions .github/workflows/build-images-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ concurrency:

jobs:
build-and-push:
name: Build and Push Images
timeout-minutes: 45
environment: release-base-images
runs-on: ubuntu-22.04
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-images-beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ permissions:

jobs:
build-and-push:
name: Build and Push Images
environment: release-beta-images
runs-on: ubuntu-22.04
strategy:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-images-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ concurrency:

jobs:
build-and-push-prs:
name: Build and Push Images
runs-on: ubuntu-22.04
strategy:
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-images-hotfixes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ permissions:

jobs:
build-and-push:
name: Build and Push Images
environment: release-developer-images
runs-on: ubuntu-22.04
strategy:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-images-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ permissions:

jobs:
build-and-push:
name: Build and Push Images
environment: release
runs-on: ubuntu-22.04
strategy:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/conformance-aks.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ConformanceAKS (ci-aks)
name: Conformance AKS (ci-aks)

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -62,6 +62,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -70,6 +71,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

generate-matrix:
name: Generate Matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -104,7 +106,7 @@ jobs:
echo "matrix=$(jq -c . < /tmp/matrix.json)" >> $GITHUB_OUTPUT

installation-and-connectivity:
name: "Installation and Connectivity Test"
name: Installation and Connectivity Test
needs: generate-matrix
runs-on: ubuntu-latest
timeout-minutes: 60
Expand Down Expand Up @@ -331,6 +333,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: installation-and-connectivity
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/conformance-aws-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -69,6 +70,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

generate-matrix:
name: Generate Matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -103,7 +105,7 @@ jobs:
echo "matrix=$(jq -c . < /tmp/matrix.json)" >> $GITHUB_OUTPUT

installation-and-connectivity:
name: "Installation and Connectivity Test"
name: Installation and Connectivity Test
needs: generate-matrix
runs-on: ubuntu-latest
timeout-minutes: 45
Expand Down Expand Up @@ -295,6 +297,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: installation-and-connectivity
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/conformance-clustermesh.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ClusterMesh (ci-multicluster)
name: Conformance Cluster Mesh (ci-clustermesh)

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -65,6 +65,7 @@ env:

jobs:
commit-status-start:
name: Commmit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -73,7 +74,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

installation-and-connectivity:
name: "Installation and Connectivity Test"
name: Installation and Connectivity Test
runs-on: ubuntu-latest
timeout-minutes: 60
env:
Expand Down Expand Up @@ -444,6 +445,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: installation-and-connectivity
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/conformance-e2e.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Cilium Conformance E2E (ci-e2e)
name: Conformance E2E (ci-e2e)

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -58,6 +58,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand Down Expand Up @@ -370,6 +371,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: setup-and-test
runs-on: ubuntu-latest
steps:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/conformance-eks.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ConformanceEKS (ci-eks)
name: Conformance EKS (ci-eks)

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -61,6 +61,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -69,6 +70,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

generate-matrix:
name: Generate Matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -103,7 +105,7 @@ jobs:
echo "matrix=$(jq -c . < /tmp/matrix.json)" >> $GITHUB_OUTPUT

installation-and-connectivity:
name: "Installation and Connectivity Test"
name: Installation and Connectivity Test
needs: generate-matrix
runs-on: ubuntu-latest
timeout-minutes: 75
Expand Down Expand Up @@ -316,6 +318,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: installation-and-connectivity
runs-on: ubuntu-latest
steps:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/conformance-externalworkloads.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: External workloads (ci-external-workloads)
name: Conformance External Workloads (ci-external-workloads)

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -62,6 +62,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -70,6 +71,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

generate-matrix:
name: Generate Matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -104,7 +106,7 @@ jobs:
echo "matrix=$(jq -c . < /tmp/matrix.json)" >> $GITHUB_OUTPUT

installation-and-connectivity:
name: "Installation and Connectivity Test"
name: Installation and Connectivity Test
needs: generate-matrix
runs-on: ubuntu-latest
timeout-minutes: 45
Expand Down Expand Up @@ -348,6 +350,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: installation-and-connectivity
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/conformance-gateway-api.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ConformanceGatewayAPI
name: Conformance Gateway API

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -65,6 +65,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -73,6 +74,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

gateway-api-conformance-test:
name: Gateway API Conformance Test
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
Expand Down Expand Up @@ -222,6 +224,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: gateway-api-conformance-test
runs-on: ubuntu-latest
steps:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/conformance-gke.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ConformanceGKE (ci-gke)
name: Conformance GKE (ci-gke)

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -60,6 +60,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -68,6 +69,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

generate-matrix:
name: Generate Matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -109,7 +111,7 @@ jobs:
echo "matrix=$(jq -c . < /tmp/matrix.json)" >> $GITHUB_OUTPUT

installation-and-connectivity:
name: "Installation and Connectivity Test"
name: Installation and Connectivity Test
needs: generate-matrix
runs-on: ubuntu-latest
timeout-minutes: 75
Expand Down Expand Up @@ -308,6 +310,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: installation-and-connectivity
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/conformance-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ConformanceIngress
name: Conformance Ingress

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -63,6 +63,7 @@ env:

jobs:
commit-status-start:
name: Commit Status Start
runs-on: ubuntu-latest
steps:
- name: Set initial commit status
Expand All @@ -71,6 +72,7 @@ jobs:
sha: ${{ inputs.SHA || github.sha }}

ingress-conformance-test:
name: Ingress Conformance Test
runs-on: ubuntu-latest
timeout-minutes: 120
strategy:
Expand Down Expand Up @@ -274,6 +276,7 @@ jobs:

commit-status-final:
if: ${{ always() }}
name: Commit Status Final
needs: ingress-conformance-test
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/conformance-kind.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ConformanceKind
name: Conformance Kind

# Any change in triggers needs to be reflected in the concurrency group.
on:
Expand Down Expand Up @@ -27,6 +27,7 @@ env:

jobs:
installation-and-connectivity:
name: Installation and Connectivity Test
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ jobs:
name: Validate & Build HTML
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
persist-credentials: false
- uses: docker://quay.io/cilium/docs-builder:d5505e230c0164b51855b002c2a0abeeff78870c@sha256:95940ef277ae14c745769e332c968d8357a43e363eab0b088c5d5efa22089260
- name: Build HTML
uses: docker://quay.io/cilium/docs-builder:d5505e230c0164b51855b002c2a0abeeff78870c@sha256:95940ef277ae14c745769e332c968d8357a43e363eab0b088c5d5efa22089260
with:
entrypoint: ./Documentation/check-build.sh
args: html