From 0335a51448e01f49d1c48c9898c53372f2c2c2c0 Mon Sep 17 00:00:00 2001
From: ykadowak <yusuke.kadowaki.1231@gmail.com>
Date: Thu, 30 Nov 2023 07:01:55 +0000
Subject: [PATCH] Revert "Add step to get k3s latest version (#2206)"

This reverts commit 3af9773c4667344fa2b1366dd03c0b8c0f1955ce.
---
 .github/actions/setup-e2e/action.yaml |  1 +
 .github/actions/setup-k3d/action.yaml | 16 ----------------
 Makefile.d/dependencies.mk            |  8 +-------
 versions/K3S_VERSION                  |  1 -
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 versions/K3S_VERSION

diff --git a/.github/actions/setup-e2e/action.yaml b/.github/actions/setup-e2e/action.yaml
index 0a4e51fb8f..897f333926 100644
--- a/.github/actions/setup-e2e/action.yaml
+++ b/.github/actions/setup-e2e/action.yaml
@@ -81,6 +81,7 @@ runs:
       with:
         agents: 3
         ingress_port: ${{ inputs.ingress_port }}
+        options: "--image docker.io/rancher/k3s:latest"
     - name: Check Kubernetes cluster
       shell: bash
       run: |
diff --git a/.github/actions/setup-k3d/action.yaml b/.github/actions/setup-k3d/action.yaml
index 99e10bfa27..079def0631 100644
--- a/.github/actions/setup-k3d/action.yaml
+++ b/.github/actions/setup-k3d/action.yaml
@@ -21,10 +21,6 @@ inputs:
     description: "k3d version"
     required: false
     default: "latest"
-  k3s_version:
-    description: "The k3s to use. The default version is `versions/K3S_VERSION`"
-    required: false
-    default: ""
   name:
     description: "Cluster name"
     required: false
@@ -56,16 +52,6 @@ runs:
       env:
         K3D_VERSION: ${{ inputs.version }}
 
-    - name: Detect k3s version
-      id: k3s_version
-      shell: bash
-      run: |
-        K3S_VERSION=${K3S_VERSION:-`cat versions/K3S_VERSION`}
-
-        echo "tag=${K3S_VERSION=$}" >> $GITHUB_OUTPUT
-      env:
-        K3S_VERSION: ${{ inputs.k3s_version }}
-
     - name: Install k3d
       shell: bash
       run: |
@@ -88,13 +74,11 @@ runs:
         if [ "${INGRESS_PORT}" != 0 ]; then
           OPTIONS="${OPTIONS} -p ${INGRESS_PORT}:80@loadbalancer"
         fi
-        OPTIONS="${OPTIONS} --image rancher/k3s:${K3S_VERSION}"
         echo "options=${OPTIONS}" >> $GITHUB_OUTPUT
       env:
         AGENTS: ${{ inputs.agents }}
         INGRESS_PORT: ${{ inputs.ingress_port }}
         OPTIONS: ${{ inputs.options }}
-        K3S_VERSION: ${{ steps.k3s_version.outputs.tag }}
 
     - name: Create k8s cluster
       shell: bash
diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk
index 7f528edc47..4f03a42add 100644
--- a/Makefile.d/dependencies.mk
+++ b/Makefile.d/dependencies.mk
@@ -24,10 +24,9 @@ update/libs: \
 	update/helm-docs \
 	update/helm-operator \
 	update/jaeger-operator \
-	update/k3s \
 	update/kind \
-	update/kube-linter \
 	update/kubectl \
+	update/kube-linter \
 	update/ngt \
 	update/prometheus-stack \
 	update/protobuf \
@@ -78,11 +77,6 @@ go/example/deps:
 update/chaos-mesh:
 	curl --silent https://api.github.com/repos/chaos-mesh/chaos-mesh/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/CHAOS_MESH_VERSION
 
-.PHONY: update/k3s
-## update k3s version
-update/k3s:
-	curl --silent https://hub.docker.com/v2/repositories/rancher/k3s/tags | jq -r '.results[].name' | grep -E '.*-k3s1$$' | sort -V | tail -n 1 > $(ROOTDIR)/versions/K3S_VERSION
-
 .PHONY: update/go
 ## update go version
 update/go:
diff --git a/versions/K3S_VERSION b/versions/K3S_VERSION
deleted file mode 100644
index 079b9ecbc4..0000000000
--- a/versions/K3S_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v1.28.2-k3s1