Skip to content

Commit b9b14bd

Browse files
dhaiducekopenshift-merge-robot
authored andcommitted
Set "minimum" tag in Makefile; Bump to K8s v1.19
Signed-off-by: Dale Haiducek <[email protected]>
1 parent 765b278 commit b9b14bd

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/kind.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26+
# Run tests on oldest and newest supported OCP Kubernetes
27+
# The "minimum" tag is set in the Makefile
28+
# KinD tags: https://hub.docker.com/r/kindest/node/tags
2629
kind:
2730
- 'minimum'
2831
- 'latest'
@@ -59,10 +62,8 @@ jobs:
5962
make test
6063
6164
- name: Create K8s KinD Cluster - ${{ matrix.kind }}
62-
# Overwrite "minimum" with an actual tag; OCP 4.8 runs Kubernetes v1.21
63-
# KinD tags: https://hub.docker.com/r/kindest/node/tags
6465
env:
65-
KIND_VERSION: ${{ matrix.kind == 'minimum' && 'v1.21.14' || matrix.kind }}
66+
KIND_VERSION: ${{ matrix.kind }}
6667
run: |
6768
make kind-bootstrap-cluster-dev
6869

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ MANAGED_CLUSTER_NAME ?= managed
4444
HUB_CONFIG ?= $(PWD)/kubeconfig_hub
4545
HUB_CONFIG_INTERNAL ?= $(PWD)/kubeconfig_hub_internal
4646
MANAGED_CONFIG ?= $(PWD)/kubeconfig_managed
47-
ifneq ($(KIND_VERSION), latest)
47+
# Set the Kind version tag
48+
ifeq ($(KIND_VERSION), minimum)
49+
KIND_ARGS = --image kindest/node:v1.19.16
50+
else ifneq ($(KIND_VERSION), latest)
4851
KIND_ARGS = --image kindest/node:$(KIND_VERSION)
4952
else
5053
KIND_ARGS =

0 commit comments

Comments
 (0)