Skip to content

Commit 32c5a06

Browse files
committed
fix(ci): kind k8s version matrix was incorrect
1 parent ab8adb9 commit 32c5a06

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/operator-ci.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ jobs:
7979
id: kind
8080
uses: helm/kind-action@v1
8181
with:
82-
version: v0.26.0
83-
kubernetes_version: v${{ matrix.k8s-version }}
84-
install_only: true
82+
version: v0.29.0
83+
node_image: kindest/node:v${{ matrix.k8s-version }}
84+
config: operator/config/local-dev/kind-config.yaml
85+
cluster_name: kind
8586
# Cache build tools and dependencies for faster builds
8687
- name: Restore cached Binaries
8788
id: cached-binaries
@@ -110,7 +111,7 @@ jobs:
110111
- name: end-to-end-tests
111112
run: |
112113
cd operator
113-
GITHUB_TOKEN=${{ secrets.github_token }} make create-kind-cluster
114+
make setup-kind-cluster
114115
make test
115116
116117
# Build multi-platform container image and push to registry

operator/Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,17 @@ else
192192
DOCKER_AUTH_FILE=${HOME}/.config/containers/auth.json
193193
endif
194194

195-
create-kind-cluster: ## deletes and creates a new kind cluster. versions is set via KIND_VERSION
196-
ifdef CI
197-
@echo $(GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_ACTOR) --password-stdin
198-
endif
199-
kind delete cluster && kind create cluster --image=kindest/node:v$(KIND_VERSION) --config config/local-dev/kind-config.yaml
200-
$(KUBECTL) label node/kind-worker skyhook.nvidia.com/test-node=skyhooke2e
201-
195+
setup-kind-cluster: ## setup kind cluster with local docker creds and skyhook namespace
202196
## sets you local $(DOCKER_CMD) creds into a secret in kind in the skyhook namespace
197+
$(KUBECTL) label node/kind-worker skyhook.nvidia.com/test-node=skyhooke2e
203198
$(KUBECTL) create namespace $(SKYHOOK_NAMESPACE) --dry-run=client -o yaml | kubectl apply -f -
204199
$(KUBECTL) create secret generic node-init-secret --type=kubernetes.io/dockerconfigjson -n $(SKYHOOK_NAMESPACE) \
205200
--from-file=.dockerconfigjson=$(DOCKER_AUTH_FILE)
206201

202+
create-kind-cluster: ## deletes and creates a new kind cluster. versions is set via KIND_VERSION
203+
kind delete cluster && kind create cluster --image=kindest/node:v$(KIND_VERSION) --config config/local-dev/kind-config.yaml
204+
$(MAKE) setup-kind-cluster
205+
207206
podman-create-machine: ## creates a podman machine
208207
podman machine stop podman-machine-default || true
209208
podman machine rm -f podman-machine-default || true

0 commit comments

Comments
 (0)