Skip to content

Commit

Permalink
Set "minimum" tag in Makefile; Bump to K8s v1.19
Browse files Browse the repository at this point in the history
Signed-off-by: Dale Haiducek <[email protected]>
  • Loading branch information
dhaiducek committed Nov 28, 2022
1 parent 6759244 commit e125e9f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
strategy:
fail-fast: false
matrix:
# Run tests on oldest and newest supported OCP Kubernetes
# The "minimum" tag is set in the Makefile
# KinD tags: https://hub.docker.com/r/kindest/node/tags
kind:
- 'minimum'
- 'latest'
Expand Down Expand Up @@ -59,10 +62,8 @@ jobs:
make test
- name: Create K8s KinD Cluster - ${{ matrix.kind }}
# Overwrite "minimum" with an actual tag; OCP 4.8 runs Kubernetes v1.21
# KinD tags: https://hub.docker.com/r/kindest/node/tags
env:
KIND_VERSION: ${{ matrix.kind == 'minimum' && 'v1.21.14' || matrix.kind }}
KIND_VERSION: ${{ matrix.kind }}
run: |
make kind-bootstrap-cluster-dev
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ MANAGED_CLUSTER_NAME ?= managed
HUB_CONFIG ?= $(PWD)/kubeconfig_hub
HUB_CONFIG_INTERNAL ?= $(PWD)/kubeconfig_hub_internal
MANAGED_CONFIG ?= $(PWD)/kubeconfig_managed
ifneq ($(KIND_VERSION), latest)
# Set the Kind version tag
ifeq ($(KIND_VERSION), minimum)
KIND_ARGS = --image kindest/node:v1.19.16
else ifneq ($(KIND_VERSION), latest)
KIND_ARGS = --image kindest/node:$(KIND_VERSION)
else
KIND_ARGS =
Expand Down

0 comments on commit e125e9f

Please sign in to comment.