-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* limitador_cluster_envoyfilter_controller optional * rate_limiting_wasmplugin_controller optional * istio optional The operator runs even when Istio or GatewayAPI are not present * locking istio deps on its own golang package. part 1 * locking istio deps on its own golang package. part 2 * istio tests. part 1 * istio tests. part 2 * pkg/istio/external_authorizer.go: fix kuadrant cr removal when istio not installed * doc/development.md: update * istio tests. part 3 * istio tests. part 4 * doc/development.md: little change * kuadrant status reports on lack of at least one of the supported GatewayAPI providers * bring changes from main * fix conflicts * fix unittests * fix controllers/kuadrant_controller_test.go name * Update .github/workflows/test.yaml Co-authored-by: Kevin Fan <[email protected]> * Update .github/workflows/test.yaml Co-authored-by: Kevin Fan <[email protected]> * Update .github/workflows/test.yaml Co-authored-by: Kevin Fan <[email protected]> * moving istio registration logic back to controllers * Update tests/gatewayapi/suite_test.go Co-authored-by: Guilherme Cassolato <[email protected]> * controllers/authpolicy_authconfig.go: revert unnecessary change * GATEWAYAPI_PROVIDER=istio in lowercase * bring change from 'Start subnet offset at 1 to avoid overlap with kind cluster ips' CommitID: 3cd0fa9 * integration tests: INTEGRATION_TESTS_EXTRA_ARGS makefile variable --------- Co-authored-by: Kevin Fan <[email protected]> Co-authored-by: Guilherme Cassolato <[email protected]>
- Loading branch information
3 people
authored
Jun 3, 2024
1 parent
7481023
commit 833650b
Showing
53 changed files
with
2,942 additions
and
1,700 deletions.
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -2,10 +2,10 @@ name: Test | |
|
|
||
| on: | ||
| push: | ||
| branches: [ 'main' ] | ||
| branches: ['main'] | ||
|
|
||
| pull_request: | ||
| branches: [ '*' ] | ||
| branches: ['*'] | ||
| paths-ignore: | ||
| - '**.adoc' | ||
| - '**.md' | ||
|
|
@@ -20,8 +20,8 @@ jobs: | |
| name: Unit Tests | ||
| strategy: | ||
| matrix: | ||
| go-version: [ 1.21.x ] | ||
| platform: [ ubuntu-latest ] | ||
| go-version: [1.21.x] | ||
| platform: [ubuntu-latest] | ||
| runs-on: ${{ matrix.platform }} | ||
| defaults: | ||
| run: | ||
|
|
@@ -49,16 +49,16 @@ jobs: | |
| fail_ci_if_error: false | ||
| verbose: true | ||
|
|
||
| integration-tests: | ||
| name: Integration Tests | ||
| controllers-integration-tests: | ||
| name: Integration Tests for github.com/kuadrant/kuadrant-operator/controllers | ||
| strategy: | ||
| matrix: | ||
| istio-type: [ sail, istioctl ] | ||
| pr-event: | ||
| - ${{ github.event_name == 'pull_request' }} | ||
| exclude: | ||
| - istio-type: sail | ||
| pr-event: true | ||
| gatewayapi-provider: [istio] | ||
| include: | ||
| # - istio-type: sail | ||
| # gatewayapi-provider: istio | ||
| - istio-type: istioctl | ||
| gatewayapi-provider: istio | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| KIND_CLUSTER_NAME: kuadrant-test | ||
|
|
@@ -84,12 +84,9 @@ jobs: | |
| - name: Check cluster info | ||
| run: | | ||
| kubectl cluster-info dump | ||
| - name: Run make test-env-setup istio-type=${{ matrix.istio-type }} | ||
| - name: Run make env-setup GATEWAYAPI_PROVIDER=${{ matrix.gatewayapi-provider }} ISTIO_INSTALL_SAIL=${{ matrix.istio-type == 'sail' && true || false }} | ||
| run: | | ||
| make test-env-setup ISTIO_INSTALL_SAIL=${{ matrix.istio-type == 'sail' && true || false }} | ||
| - name: Wait for deployments | ||
| run: | | ||
| kubectl -n ${{ env.KUADRANT_NAMESPACE }} wait --timeout=300s --for=condition=Available deployments --all | ||
| make env-setup GATEWAYAPI_PROVIDER=${{ matrix.gatewayapi-provider }} ISTIO_INSTALL_SAIL=${{ matrix.istio-type == 'sail' && true || false }} | ||
| - name: Run integration tests | ||
| run: | | ||
| make test-integration | ||
|
|
@@ -101,7 +98,142 @@ jobs: | |
| uses: codecov/codecov-action@v4 | ||
| with: | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| flags: integration | ||
| flags: controllers-integration | ||
| fail_ci_if_error: false | ||
| verbose: true | ||
|
|
||
| bare-k8s-integration-tests: | ||
| name: Integration Tests for github.com/kuadrant/kuadrant-operator/tests/bare_k8s | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| KIND_CLUSTER_NAME: kuadrant-test | ||
| KUADRANT_NAMESPACE: kuadrant-system | ||
| defaults: | ||
| run: | ||
| shell: bash | ||
| steps: | ||
| - name: Set up Go 1.21.x | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: 1.21.x | ||
| id: go | ||
| - name: Check out code | ||
| uses: actions/checkout@v4 | ||
| - name: Create k8s Kind Cluster | ||
| uses: helm/[email protected] | ||
| with: | ||
| version: v0.22.0 | ||
| config: utils/kind-cluster.yaml | ||
| cluster_name: ${{ env.KIND_CLUSTER_NAME }} | ||
| wait: 120s | ||
| - name: Check cluster info | ||
| run: | | ||
| kubectl cluster-info dump | ||
| - name: Run make k8s-env-setup | ||
| run: | | ||
| make k8s-env-setup | ||
| - name: Run integration tests | ||
| run: | | ||
| make test-bare-k8s-integration | ||
| - name: Upload integration-test coverage reports to CodeCov | ||
| # more at https://github.com/codecov/codecov-action | ||
| # Only run if the feature branch is in your repo (not in a fork) | ||
| # as Tokenless uploading is rate limited for public repos | ||
| if: github.event.pull_request.head.repo.full_name == github.repository | ||
| uses: codecov/codecov-action@v4 | ||
| with: | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| flags: bare-k8s-integration | ||
| fail_ci_if_error: false | ||
| verbose: true | ||
|
|
||
| gatewayapi-integration-tests: | ||
| name: Integration Tests for github.com/kuadrant/kuadrant-operator/tests/gatewayapi | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| KIND_CLUSTER_NAME: kuadrant-test | ||
| KUADRANT_NAMESPACE: kuadrant-system | ||
| defaults: | ||
| run: | ||
| shell: bash | ||
| steps: | ||
| - name: Set up Go 1.21.x | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: 1.21.x | ||
| id: go | ||
| - name: Check out code | ||
| uses: actions/checkout@v4 | ||
| - name: Create k8s Kind Cluster | ||
| uses: helm/[email protected] | ||
| with: | ||
| version: v0.22.0 | ||
| config: utils/kind-cluster.yaml | ||
| cluster_name: ${{ env.KIND_CLUSTER_NAME }} | ||
| wait: 120s | ||
| - name: Check cluster info | ||
| run: | | ||
| kubectl cluster-info dump | ||
| - name: Run make gatewayapi-env-setup | ||
| run: | | ||
| make gatewayapi-env-setup | ||
| - name: Run integration tests | ||
| run: | | ||
| make test-gatewayapi-env-integration | ||
| - name: Upload integration-test coverage reports to CodeCov | ||
| # more at https://github.com/codecov/codecov-action | ||
| # Only run if the feature branch is in your repo (not in a fork) | ||
| # as Tokenless uploading is rate limited for public repos | ||
| if: github.event.pull_request.head.repo.full_name == github.repository | ||
| uses: codecov/codecov-action@v4 | ||
| with: | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| flags: gatewayapi-integration | ||
| fail_ci_if_error: false | ||
| verbose: true | ||
|
|
||
| istio-integration-tests: | ||
| name: Integration Tests for github.com/kuadrant/kuadrant-operator/tests/istio | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| KIND_CLUSTER_NAME: kuadrant-test | ||
| KUADRANT_NAMESPACE: kuadrant-system | ||
| defaults: | ||
| run: | ||
| shell: bash | ||
| steps: | ||
| - name: Set up Go 1.21.x | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: 1.21.x | ||
| id: go | ||
| - name: Check out code | ||
| uses: actions/checkout@v4 | ||
| - name: Create k8s Kind Cluster | ||
| uses: helm/[email protected] | ||
| with: | ||
| version: v0.22.0 | ||
| config: utils/kind-cluster.yaml | ||
| cluster_name: ${{ env.KIND_CLUSTER_NAME }} | ||
| wait: 120s | ||
| - name: Check cluster info | ||
| run: | | ||
| kubectl cluster-info dump | ||
| - name: Run make istio-env-setup | ||
| run: | | ||
| make istio-env-setup | ||
| - name: Run integration tests | ||
| run: | | ||
| make test-istio-env-integration | ||
| - name: Upload integration-test coverage reports to CodeCov | ||
| # more at https://github.com/codecov/codecov-action | ||
| # Only run if the feature branch is in your repo (not in a fork) | ||
| # as Tokenless uploading is rate limited for public repos | ||
| if: github.event.pull_request.head.repo.full_name == github.repository | ||
| uses: codecov/codecov-action@v4 | ||
| with: | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| flags: istio-integration | ||
| fail_ci_if_error: false | ||
| verbose: true | ||
|
|
||
|
|
@@ -154,8 +286,8 @@ jobs: | |
| name: Test Scripts | ||
| strategy: | ||
| matrix: | ||
| go-version: [ 1.21.x ] | ||
| platform: [ ubuntu-latest, macos-latest ] | ||
| go-version: [1.21.x] | ||
| platform: [ubuntu-latest, macos-latest] | ||
| runs-on: ${{ matrix.platform }} | ||
| defaults: | ||
| run: | ||
|
|
||
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
File renamed without changes.
File renamed without changes.
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.