Set "oldest" tag in Makefile; Bump to K8s v1.19

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
open-cluster-management-io · Nov 28, 2022 · a6f5056 · a6f5056
1 parent 2e01f54
commit a6f5056
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
@@ -23,10 +23,10 @@ jobs:
     strategy:
       matrix:
         # Run tests on oldest and newest supported OCP Kubernetes
-        # - OCP 4.5 runs Kubernetes v1.18
+        # The "oldest" tag is set in the Makefile
         # KinD tags: https://hub.docker.com/r/kindest/node/tags
         kind:
-          - 'v1.18.15'
+          - 'oldest'
           - 'latest'
     name: KinD tests
     steps:

diff --git a/Makefile b/Makefile
@@ -34,7 +34,10 @@ KIND_NAMESPACE ?= open-cluster-management-agent-addon
 KIND_VERSION ?= latest
 MANAGED_CLUSTER_NAME ?= managed
 WATCH_NAMESPACE ?= $(MANAGED_CLUSTER_NAME)
-ifneq ($(KIND_VERSION), latest)
+# Set the Kind version tag
+ifeq ($(KIND_VERSION), oldest)
+	KIND_ARGS = --image kindest/node:v1.19.16
+else ifneq ($(KIND_VERSION), latest)
 	KIND_ARGS = --image kindest/node:$(KIND_VERSION)
 else
 	KIND_ARGS =