Merge branch 'main' into crd-validation-expressions-plugins-can-only-…

…set-config-or-configFrom

.github/workflows/_integration_tests.yaml

@@ -106,6 +106,10 @@ jobs:
  - name: dbless-invalid-config
  test: dbless
  run_invalid_config: "true"
+ # This should use the default router flavor (via TEST_KONG_ROUTER_FLAVOR)
+ # Remove the override here when
+ # https:/Kong/kubernetes-ingress-controller/issues/5127 is resolved.
+ router-flavor: 'traditional'
  go_test_flags: -run=TestIngressRecoverFromInvalidPath
 
  steps:
@@ -153,7 +157,10 @@ jobs:
  KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
  KONG_CONTROLLER_FEATURE_GATES: "${{ matrix.feature_gates }}"
  JUNIT_REPORT: integration-tests-${{ matrix.name }}.xml
- TEST_KONG_ROUTER_FLAVOR: ${{ matrix.router-flavor }}
+ # Use Github's "ternary operator" to fallback to default router flavor
+ # defined in env.TEST_KONG_ROUTER_FLAVOR
+ # Ref: https://docs.github.com/en/actions/learn-github-actions/expressions#example
+ TEST_KONG_ROUTER_FLAVOR: ${{ matrix.router-flavor != '' && matrix.router-flavor || env.TEST_KONG_ROUTER_FLAVOR }}
  TEST_RUN_INVALID_CONFIG_CASES: ${{ matrix.run_invalid_config }}
  GOTESTFLAGS: "${{ matrix.go_test_flags }}"