Skip to content

Commit 577c2ef

Browse files
authored
Update k8s variable syntax for minikube & kind (#8347)
1 parent 2532691 commit 577c2ef

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/actions/smoke-tests/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ runs:
5252
- name: Deploy Kubernetes
5353
id: k8s
5454
run: |
55-
make -f tests/Makefile create-kind-cluster K8S_CLUSTER_NAME=${{ github.run_id }} K8S_CLUSTER_VERSION=${{ inputs.k8s-version }} K8S_TIMEOUT=${{ inputs.k8s-timeout }}
55+
make -f tests/Makefile create-kind-cluster K8S_CLUSTER_NAME=${{ github.run_id }} K8S_CLUSTER_VERSION=v${{ inputs.k8s-version }} K8S_TIMEOUT=${{ inputs.k8s-timeout }}
5656
make -f tests/Makefile image-load REGISTRY="" PREFIX=${{ inputs.image-name }} TAG=${{ inputs.tag }} K8S_CLUSTER_NAME=${{ github.run_id }}
5757
label="${{ inputs.label }}"
5858
nospaces="${label// /_}"

tests/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ run-tests-in-kind: ## Run tests in Kind
123123
create-kind-cluster: $(KIND_KUBE_CONFIG_FOLDER) ## Create a Kind K8S cluster
124124
@kind create cluster \
125125
--name $(K8S_CLUSTER_NAME) \
126-
--image=kindest/node:v$(K8S_CLUSTER_VERSION) \
126+
--image=kindest/node:$(K8S_CLUSTER_VERSION) \
127127
--config=<(sed 's/dual/${IP_FAMILY}/' $(ROOT_DIR)/tests/ci-files/ci-kind-config.yaml) \
128128
--wait $(K8S_TIMEOUT)
129129
@kind get kubeconfig --name $(K8S_CLUSTER_NAME) --internal > $(KIND_KUBE_CONFIG_FOLDER)/config
@@ -164,7 +164,7 @@ run-tests-in-minikube: ## Run tests in Minikube
164164

165165
.PHONY: create-mini-cluster
166166
create-mini-cluster: $(MINIKUBE_KUBE_CONFIG_FOLDER) ## Create a Minikube K8S cluster
167-
@minikube start --kubernetes-version=v$(K8S_CLUSTER_VERSION) \
167+
@minikube start --kubernetes-version=$(K8S_CLUSTER_VERSION) \
168168
&& KUBECONFIG=$(MINIKUBE_KUBE_CONFIG_FOLDER)/config minikube update-context \
169169
&& KUBECONFIG=$(MINIKUBE_KUBE_CONFIG_FOLDER)/config kubectl config set-cluster minikube --server=https://minikube:8443
170170

0 commit comments

Comments
 (0)