-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add composite provider to support multiple network providers (#224)
* add composite provider Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> * fix nginx lua script and add E2E Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> * fix test case Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> * revert image Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> * fix indent Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> * follow latest interface change Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> * move e2e to v1beta1 file and add workflow Signed-off-by: Megrez Lu <lujiajing1126@gmail.com> --------- Signed-off-by: Megrez Lu <lujiajing1126@gmail.com>
- Loading branch information
1 parent
f0363f2
commit 6854752
Showing
8 changed files
with
358 additions
and
21 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 |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| name: E2E-Multiple-NetworkProvider | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - release-* | ||
| pull_request: {} | ||
| workflow_dispatch: {} | ||
|
|
||
| env: | ||
| # Common versions | ||
| GO_VERSION: '1.17' | ||
| KIND_IMAGE: 'kindest/node:v1.23.3' | ||
| KIND_CLUSTER_NAME: 'ci-testing' | ||
|
|
||
| jobs: | ||
|
|
||
| rollout: | ||
| runs-on: ubuntu-20.04 | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| submodules: true | ||
| - name: Setup Go | ||
| uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: ${{ env.GO_VERSION }} | ||
| - name: Setup Kind Cluster | ||
| uses: helm/kind-action@v1.2.0 | ||
| with: | ||
| node_image: ${{ env.KIND_IMAGE }} | ||
| cluster_name: ${{ env.KIND_CLUSTER_NAME }} | ||
| config: ./test/kind-conf.yaml | ||
| - name: Build image | ||
| run: | | ||
| export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}" | ||
| docker build --pull --no-cache . -t $IMAGE | ||
| kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; } | ||
| - name: Install Kruise Rollout | ||
| run: | | ||
| set -ex | ||
| kubectl cluster-info | ||
| IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh | ||
| for ((i=1;i<10;i++)); | ||
| do | ||
| set +e | ||
| PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l) | ||
| set -e | ||
| if [ "$PODS" -eq "1" ]; then | ||
| break | ||
| fi | ||
| sleep 3 | ||
| done | ||
| set +e | ||
| PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l) | ||
| kubectl get node -o yaml | ||
| kubectl get all -n kruise-rollout -o yaml | ||
| set -e | ||
| if [ "$PODS" -eq "1" ]; then | ||
| echo "Wait for kruise-rollout ready successfully" | ||
| else | ||
| echo "Timeout to wait for kruise-rollout ready" | ||
| exit 1 | ||
| fi | ||
| - name: Run E2E Tests | ||
| run: | | ||
| export KUBECONFIG=/home/runner/.kube/config | ||
| kubectl apply -f ./test/e2e/test_data/customNetworkProvider/istio_crd.yaml | ||
| kubectl apply -f ./test/e2e/test_data/customNetworkProvider/lua_script_configmap.yaml | ||
| make ginkgo | ||
| set +e | ||
| ./bin/ginkgo -timeout 60m -v --focus='Canary rollout with multiple network providers' test/e2e | ||
| retVal=$? | ||
| # kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout | ||
| restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}') | ||
| if [ "${restartCount}" -eq "0" ];then | ||
| echo "Kruise-rollout has not restarted" | ||
| else | ||
| kubectl get pod -n kruise-rollout --no-headers | ||
| echo "Kruise-rollout has restarted, abort!!!" | ||
| kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout | ||
| exit 1 | ||
| fi | ||
| exit $retVal |
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,66 @@ | ||
| /* | ||
| Copyright 2024 The Kruise Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package network | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/validation/field" | ||
|
|
||
| "github.com/openkruise/rollouts/api/v1beta1" | ||
| ) | ||
|
|
||
| var ( | ||
| _ NetworkProvider = (CompositeController)(nil) | ||
| ) | ||
|
|
||
| // CompositeController is a set of NetworkProvider | ||
| type CompositeController []NetworkProvider | ||
|
|
||
| func (c CompositeController) Initialize(ctx context.Context) error { | ||
| for _, provider := range c { | ||
| if err := provider.Initialize(ctx); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c CompositeController) EnsureRoutes(ctx context.Context, strategy *v1beta1.TrafficRoutingStrategy) (bool, error) { | ||
| done := true | ||
| for _, provider := range c { | ||
| if innerDone, innerErr := provider.EnsureRoutes(ctx, strategy); innerErr != nil { | ||
| return false, innerErr | ||
| } else if !innerDone { | ||
| done = false | ||
| } | ||
| } | ||
| return done, nil | ||
| } | ||
|
|
||
| func (c CompositeController) Finalise(ctx context.Context) (bool, error) { | ||
| modified := false | ||
| errList := field.ErrorList{} | ||
| for _, provider := range c { | ||
| if updated, innerErr := provider.Finalise(ctx); innerErr != nil { | ||
| errList = append(errList, field.InternalError(field.NewPath("FinalizeChildNetworkProvider"), innerErr)) | ||
| } else if updated { | ||
| modified = true | ||
| } | ||
| } | ||
| return modified, errList.ToAggregate() | ||
| } |
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.