From e589db07ccc698ae02f4af9957f8b444fbc4c1f0 Mon Sep 17 00:00:00 2001
From: datelier <57349093+datelier@users.noreply.github.com>
Date: Thu, 4 Aug 2022 10:23:06 +0900
Subject: [PATCH] fix chaos test (#1757)

* fix chaos test

* update chaos-mesh
---
 .github/workflows/e2e-chaos.yaml | 16 ++++++++--------
 Makefile.d/tools.mk              |  9 ---------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/e2e-chaos.yaml b/.github/workflows/e2e-chaos.yaml
index c975b4c069..5734508c0f 100644
--- a/.github/workflows/e2e-chaos.yaml
+++ b/.github/workflows/e2e-chaos.yaml
@@ -82,8 +82,8 @@ jobs:
           wait_for_selector: app=vald-lb-gateway
       - name: deploy Chaos Mesh
         run: |
-          make kubectl/install/linux/v1.23.6
-          curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
+          make kubectl/install
+          curl -sSL https://mirrors.chaos-mesh.org/v2.3.0/install.sh | bash -s -- --k3s
           helm install \
             --set podChaos.failure.enabled=true \
             vald-chaos-test tests/chaos/chart
@@ -176,8 +176,8 @@ jobs:
           wait_for_selector: app=vald-lb-gateway
       - name: deploy Chaos Mesh
         run: |
-          make kubectl/install/linux/v1.23.6
-          curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
+          make kubectl/install
+          curl -sSL https://mirrors.chaos-mesh.org/v2.3.0/install.sh | bash -s -- --k3s
           helm install \
             --set podChaos.kill.enabled=true \
             vald-chaos-test tests/chaos/chart
@@ -270,8 +270,8 @@ jobs:
           wait_for_selector: app=vald-lb-gateway
       - name: deploy Chaos Mesh
         run: |
-          make kubectl/install/linux/v1.23.6
-          curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
+          make kubectl/install
+          curl -sSL https://mirrors.chaos-mesh.org/v2.3.0/install.sh | bash -s -- --k3s
           helm install \
             --set networkChaos.partition.enabled=true \
             vald-chaos-test tests/chaos/chart
@@ -364,8 +364,8 @@ jobs:
           wait_for_selector: app=vald-lb-gateway
       - name: deploy Chaos Mesh
         run: |
-          make kubectl/install/linux/v1.23.6
-          curl -sSL https://mirrors.chaos-mesh.org/v2.1.3/install.sh | bash -s -- --k3s
+          make kubectl/install
+          curl -sSL https://mirrors.chaos-mesh.org/v2.3.0/install.sh | bash -s -- --k3s
           helm install \
             --set networkChaos.bandwidth.enabled=true \
             vald-chaos-test tests/chaos/chart
diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk
index b9ab1baf85..9efba4c284 100644
--- a/Makefile.d/tools.mk
+++ b/Makefile.d/tools.mk
@@ -62,15 +62,6 @@ $(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