Merge main into cors_on_direct_response

.github/ISSUE_TEMPLATE/DOCS-ISSUE.yml

@@ -8,7 +8,7 @@ body:
       label: Version
       description: Which version of the Gloo Edge docs does this affect?
       options:
-        - master
+        - main
         - 1.14.x (latest)
         - 1.13.x 
         - 1.12.x

.github/pull_request_template.md

@@ -10,7 +10,7 @@ Users ran into this bug doing ... \ Users needed this feature to ...
 
 # Checklist:
 
-- [ ] I included a concise, user-facing changelog (for details, see https://github.com/solo-io/go-utils/tree/master/changelogutils) which references the issue that is resolved.
+- [ ] I included a concise, user-facing changelog (for details, see https://github.com/solo-io/go-utils/tree/main/changelogutils) which references the issue that is resolved.
 - [ ] If I updated APIs (our protos) or helm values, I ran `make -B install-go-tools generated-code` to ensure there will be no code diff
 - [ ] I followed guidelines laid out in the Gloo Edge [contribution guide](https://docs.solo.io/gloo-edge/latest/contributing/)
 - [ ] I opened a draft PR or added the work in progress label if my PR is not ready for review

.github/workflows/README.md

@@ -24,9 +24,9 @@ The arguments are:
 Below are some examples for inputs to the job, if you are working on a feature branched named `feature/new-api`
 
 To test this on the default main branch:
-- Use Workflow From: `master`
+- Use Workflow From: `main`
 - The branch that contains the relevant API change: `feature/new-api`
-- The LTS branch that these API changes are targeted for: `master`
+- The LTS branch that these API changes are targeted for: `main`
 
 To test this on 1.13.x branch:
 - Use Workflow From: `v1.13.x`
@@ -36,7 +36,7 @@ To test this on 1.13.x branch:
 **NOTE: After the PR opens in solo-apis, we want to avoid the chance that it merges. Please put a 'work in progress' label on the PR to prevent it from merging.**
 
 ## [Regression Tests](./regression-tests.yaml)
-Regression tests run the suite of [Kubernetes End-To-End Tests](https://github.com/solo-io/gloo/tree/master/test).
+Regression tests run the suite of [Kubernetes End-To-End Tests](https://github.com/solo-io/gloo/tree/main/test).
 
 ### Draft Pull Requests
 This Github Action will not run by default on a Draft Pull Request. If you would like to run this, you need to:
@@ -54,7 +54,7 @@ This Github Action will not run by default on a Draft Pull Request. If you would
 ## [Trivy Vulnerability Scanning](./trivy-analysis-scheduled.yaml)
 A scheduled job which scans images released from both the Open Source and Enterprise repositories.
 
-To run the vulnerability locally, check out [the security scanner README](https://github.com/solo-io/gloo/tree/master/docs/cmd/securityscanutils)
+To run the vulnerability locally, check out [the security scanner README](https://github.com/solo-io/gloo/tree/main/docs/cmd/securityscanutils)
 
 ## Future Work
 It would be great to add support for issue comment directives. This would mean that commenting `/sig-ci` would signal CI to run, or `/skip-ci` would auto-succeed CI.

.github/workflows/codegen.yaml

@@ -1,45 +1,24 @@
-name: CI
+name: Codegen
+
 on: pull_request
+
 jobs:
   codegen:
     name: codegen check
     runs-on: ubuntu-22.04
     steps:
-      - name: Cancel Previous Actions
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-      - name: Free disk space
-        run: |
-          echo "Before clearing disk space:"
-          df -h
-
-          # https://github.com/actions/virtual-environments/issues/709
-          sudo apt-get clean
-
-          # Clean up pre-installed tools
-          # https://github.com/actions/virtual-environments/issues/1918
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /usr/local/share/boost
-          sudo rm -rf $AGENT_TOOLSDIRECTORY
-
-          echo "After clearing disk space:"
-          df -h
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-        id: go
+      - uses: actions/checkout@v3
+      - uses: ./.github/workflows/composite-actions/prep-go-runner
       - name: Install Protoc
-        uses: arduino/setup-protoc@master
+        uses: arduino/setup-protoc@v1
         with:
           version: '3.6.1'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Generate Code
         run: |
-          ./ci/check-generated-code.sh
+          ./ci/check-generated-code.sh
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v35
+      - name: Check for DO_NOT_SUBMIT
+        run: ./ci/do-not-submit.sh ${{ steps.changed-files.outputs.all_modified_files }}

.github/workflows/composite-actions/performance-tests/action.yaml

@@ -0,0 +1,20 @@
+name: Performance Tests
+description: Runs tests with the performance label
+
+runs:
+  using: "composite"
+  steps:
+  - name: Testing - performance tests
+    shell: bash
+    run: make install-test-tools run-performance-tests
+  - name: save results
+    if: ${{ failure() }}
+    shell: bash
+    run: mkdir -p _output/performance-artifacts && echo '{"url":"https://github.com/solo-io/gloo/actions/runs/${{github.run_id}}",
+            "name":"performance"}' > _output/performance-artifacts/test-out.json
+  - uses: actions/upload-artifact@v3
+    if: ${{ failure() }}
+    with:
+      name: performance-dump
+      path: "_output/performance-artifacts"
+      if-no-files-found: warn

.github/workflows/composite-actions/prep-go-runner/action.yaml

@@ -0,0 +1,37 @@
+name: Prep Go Runner
+description: common setup steps for gloo actions
+inputs:
+  working-directory:
+    description: 'directory to run setup steps in'
+    required: false
+    default: '.'
+runs:
+  using: "composite"
+  steps:
+  - name: Cancel Previous Actions
+    uses: styfle/[email protected]
+    with:
+      access_token: ${{ github.token }}
+  - name: Free disk space
+    shell: bash
+    run: |
+      echo "Before clearing disk space:"
+      df -h
+
+      # https://github.com/actions/virtual-environments/issues/709
+      sudo apt-get clean
+
+      # Clean up pre-installed tools
+      # https://github.com/actions/virtual-environments/issues/1918
+      sudo rm -rf /usr/share/dotnet
+      sudo rm -rf /opt/ghc
+      sudo rm -rf /usr/local/share/boost
+      sudo rm -rf $AGENT_TOOLSDIRECTORY
+
+      echo "After clearing disk space:"
+      df -h
+  - name: Set up Go
+    uses: actions/setup-go@v4
+    with:
+      go-version-file: ${{ inputs.working-directory }}/go.mod
+    id: go

.github/workflows/composite-actions/process-skip-directives/action.yaml

@@ -0,0 +1,24 @@
+name: Process Skip CI Directives
+
+description: Determine which jobs should be skipped in CI
+
+inputs:
+  base-ref:
+    description: "The base github ref"
+    required: true
+
+outputs:
+  skip-kube-tests:
+    description: "Whether or not to skip the kube2e tests"
+    value: ${{ steps.process-skip-directives.outputs.skip-kube-tests }}
+  skip-docs-build:
+    description: "Whether or not to build our docs"
+    value: ${{ steps.process-skip-directives.outputs.skip-docs-build }}
+
+runs:
+  using: "composite"
+  steps:
+  - id: process-skip-directives
+    name: Process Skip Directives
+    shell: bash
+    run: ./ci/github-actions/process-skip-directives/script.sh ${{ inputs.base-ref }}

.github/actions/regression-tests/action.yaml → .github/workflows/composite-actions/regression-tests/action.yaml

@@ -1,6 +1,7 @@
 name: Gloo Regression Tests
-description: configuration to enable make targets
-
+
+description: Tests which run Gloo Edge in a Kubernetes cluster
+
 runs:
   using: "composite"
   steps:
@@ -54,15 +55,7 @@ runs:
     env:
       KUBE2E_TESTS: ${{ matrix.kube-e2e-test-type }}
     shell: bash
-    run: make run-ci-regression-tests
-  - uses: testspace-com/setup-testspace@v1
-    with:
-      domain: solo-io.testspace.com
-    if: ${{ always() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-  - name: Push result to Testspace server
-    shell: bash
-    run: testspace push --verbose "**/junit.xml"
-    if: ${{ always() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+    run: make install-test-tools run-kube-e2e-tests
   - name: save results
     if: ${{ failure() }}
     shell: bash
@@ -73,4 +66,4 @@ runs:
     with:
       name: ${{matrix.kube-e2e-test-type}}@k8s${{matrix.kube-version.kubectl}}-kube-dump
       path: "_output/kube2e-artifacts"
-      if-no-files-found: warn
+      if-no-files-found: warn