Skip to content

Commit

Permalink
Revert "Add step to get k3s latest version (#2206)"
Browse files Browse the repository at this point in the history
This reverts commit 3af9773.
  • Loading branch information
ykadowak committed Nov 30, 2023
1 parent 67b9af5 commit 9c0dafe
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 24 deletions.
1 change: 1 addition & 0 deletions .github/actions/setup-e2e/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
16 changes: 0 additions & 16 deletions .github/actions/setup-k3d/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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
Expand Down
8 changes: 1 addition & 7 deletions Makefile.d/dependencies.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion versions/K3S_VERSION

This file was deleted.

0 comments on commit 9c0dafe

Please sign in to comment.