Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/gateway/handler-invalid-argument
Browse files Browse the repository at this point in the history
  • Loading branch information
kpango authored May 23, 2022
2 parents c531982 + 4c8fae8 commit 3b52d00
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/e2e-chaos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
wait_for_selector: app=vald-lb-gateway
- name: deploy Chaos Mesh
run: |
make kubectl/install
make kubectl/install/linux/v1.23.6
curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
helm install \
--set podChaos.failure.enabled=true \
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
wait_for_selector: app=vald-lb-gateway
- name: deploy Chaos Mesh
run: |
make kubectl/install
make kubectl/install/linux/v1.23.6
curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
helm install \
--set podChaos.kill.enabled=true \
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
wait_for_selector: app=vald-lb-gateway
- name: deploy Chaos Mesh
run: |
make kubectl/install
make kubectl/install/linux/v1.23.6
curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
helm install \
--set networkChaos.partition.enabled=true \
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
wait_for_selector: app=vald-lb-gateway
- name: deploy Chaos Mesh
run: |
make kubectl/install
make kubectl/install/linux/v1.23.6
curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
helm install \
--set networkChaos.bandwidth.enabled=true \
Expand Down
9 changes: 9 additions & 0 deletions Makefile.d/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ $(BINDIR)/reviewdog:
.PHONY: kubectl/install
kubectl/install: $(BINDIR)/kubectl

## WARNING: choas-mesh install.sh check_kubernetes()
## This version information is deprecated and will be replaced with the output from kubectl version --short.
## https://github.com/chaos-mesh/chaos-mesh/blob/master/install.sh#L291
.PHONY: kubectl/install/linux/v1.23.6
kubectl/install/linux/v1.23.6:
curl -L "https://storage.googleapis.com/kubernetes-release/release/v1.23.6/bin/linux/amd64/kubectl" -o ./kubectl
chmod a+x ./kubectl
mv ./kubectl $(BINDIR)/kubectl

ifeq ($(UNAME),Darwin)
$(BINDIR)/kubectl:
curl -L "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" -o $(BINDIR)/kubectl
Expand Down
2 changes: 1 addition & 1 deletion assets/docs/overview/dataflow.drawio

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/docs/overview/delete_flow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion assets/docs/overview/search_flow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/docs/overview/update_flow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/docs/overview/upsert_flow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3b52d00

Please sign in to comment.