-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'controller-v1.3.0' into main
# Conflicts: # .github/workflows/ci.yaml # .github/workflows/depreview.yaml # .github/workflows/docs.yaml # .github/workflows/helm.yaml # Makefile # TAG # charts/ingress-nginx/CHANGELOG.md # charts/ingress-nginx/Chart.yaml # charts/ingress-nginx/values.yaml # images/nginx/rootfs/Dockerfile
- Loading branch information
Showing
119 changed files
with
2,886 additions
and
1,382 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| name: Performance Test | ||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| logLevel: | ||
| description: 'Log level' | ||
| required: true | ||
| default: 'warning' | ||
| tags: | ||
| description: 'K6 Load Test' | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| k6_test_run: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v1 | ||
|
|
||
| - name: Install K6 | ||
| run: | | ||
| wget https://github.com/grafana/k6/releases/download/v0.38.2/k6-v0.38.2-linux-amd64.tar.gz | ||
| tar -xvf k6-v0.38.2-linux-amd64.tar.gz k6-v0.38.2-linux-amd64/k6 | ||
| mv k6-v0.38.2-linux-amd64/k6 . | ||
| ./k6 | ||
| - name: Make dev-env | ||
| run: | | ||
| mkdir $HOME/.kube | ||
| make dev-env | ||
| podName=`kubectl -n ingress-nginx get po | grep -i controller | awk '{print $1}'` | ||
| if [[ -z ${podName} ]] ; then | ||
| sleep 5 | ||
| fi | ||
| kubectl wait pod -n ingress-nginx --for condition=Ready $podName | ||
| kubectl get all -A | ||
| - name: Deploy workload | ||
| run: | | ||
| kubectl create deploy k6 --image kennethreitz/httpbin --port 80 && \ | ||
| kubectl expose deploy k6 --port 80 && \ | ||
| kubectl create ing k6 --class nginx \ | ||
| --rule test.ingress-nginx-controller.ga/*=k6:80 | ||
| podName=`kubectl get po | grep -i k6 | awk '{print $1}'` | ||
| if [[ -z ${podName} ]] ; then | ||
| sleep 5 | ||
| fi | ||
| kubectl wait pod --for condition=Ready $podName | ||
| kubectl get all,secrets,ing | ||
| - name: Tune OS | ||
| run : | | ||
| sudo sysctl -A 2>/dev/null | egrep -i "local_port_range|tw_reuse|tcp_timestamps" | ||
| sudo sh -c "ulimit" | ||
| sudo sysctl -w net.ipv4.ip_local_port_range="1024 65535" | ||
| sudo sysctl -w net.ipv4.tcp_tw_reuse=1 | ||
| sudo sysctl -w net.ipv4.tcp_timestamps=1 | ||
| sudo sh -c "ulimit " | ||
| - name: Run smoke test | ||
| run: | | ||
| vmstat -at 5 | tee vmstat_report & | ||
| #./k6 login cloud -t $K6_TOKEN | ||
| #./k6 run -o cloud ./smoketest.js | ||
| ./k6 run test/k6/smoketest.js | ||
| pkill vmstat | ||
| cat vmstat_report |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| name: Scorecards supply-chain security | ||
| on: | ||
| # Only the default branch is supported. | ||
| branch_protection_rule: | ||
| schedule: | ||
| - cron: '20 11 * * 5' | ||
| push: | ||
| branches: [ "main" ] | ||
|
|
||
| # Declare default permissions as read only. | ||
| permissions: read-all | ||
|
|
||
| jobs: | ||
| analysis: | ||
| name: Scorecards analysis | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| # Needed to upload the results to code-scanning dashboard. | ||
| security-events: write | ||
| # Used to receive a badge. (Upcoming feature) | ||
| id-token: write | ||
| # Needs for private repositories. | ||
| contents: read | ||
| actions: read | ||
|
|
||
| steps: | ||
| - name: "Checkout code" | ||
| uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
| - name: "Run analysis" | ||
| uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564 # v1.1.1 | ||
| with: | ||
| results_file: results.sarif | ||
| results_format: sarif | ||
| # (Optional) Read-only PAT token. Uncomment the `repo_token` line below if: | ||
| # - you want to enable the Branch-Protection check on a *public* repository, or | ||
| # - you are installing Scorecards on a *private* repository | ||
| # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat. | ||
| # repo_token: ${{ secrets.SCORECARD_READ_TOKEN }} | ||
|
|
||
| # Publish the results for public repositories to enable scorecard badges. For more details, see | ||
| # https://github.com/ossf/scorecard-action#publishing-results. | ||
| # For private repositories, `publish_results` will automatically be set to `false`, regardless | ||
| # of the value entered here. | ||
| publish_results: true | ||
|
|
||
| # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF | ||
| # format to the repository Actions tab. | ||
| - name: "Upload artifact" | ||
| uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 | ||
| with: | ||
| name: SARIF file | ||
| path: results.sarif | ||
| retention-days: 5 | ||
|
|
||
| # Upload the results to GitHub's code scanning dashboard. | ||
| - name: "Upload to code-scanning" | ||
| uses: github/codeql-action/upload-sarif@3f62b754e23e0dd60f91b744033e1dc1654c0ec6 # v2.1.14 | ||
| with: | ||
| sarif_file: results.sarif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.