From 73ddd4be1c91021c1947faed7609452265c621ff Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Fri, 13 Sep 2024 10:26:44 -0400 Subject: [PATCH] Use Kind 0.24.0 --- Jenkinsfile.podman | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile.podman b/Jenkinsfile.podman index ed8efbb118e..965d49b4986 100644 --- a/Jenkinsfile.podman +++ b/Jenkinsfile.podman @@ -2,19 +2,21 @@ // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. // def kind_k8s_map = [ - '0.23.0': [ - '1.30.0': 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e', - '1.30': 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e', - '1.29.4': 'kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8', - '1.29': 'kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8', - '1.28.9': 'kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0', - '1.28': 'kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0', - '1.27.13': 'kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8', - '1.27': 'kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8', - '1.26.15': 'kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19', - '1.26': 'kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19', - '1.25.16': 'kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b', - '1.25': 'kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b' + '0.24.0': [ + '1.31.0': 'kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865', + '1.31': 'kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865', + '1.30.4': 'kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114', + '1.30': 'kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114', + '1.29.8': 'kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa', + '1.29': 'kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa', + '1.28.13': 'kindest/node:v1.28.13@sha256:45d319897776e11167e4698f6b14938eb4d52eb381d9e3d7a9086c16c69a8110', + '1.28': 'kindest/node:v1.28.13@sha256:45d319897776e11167e4698f6b14938eb4d52eb381d9e3d7a9086c16c69a8110', + '1.27.16': 'kindest/node:v1.27.17@sha256:3fd82731af34efe19cd54ea5c25e882985bafa2c9baefe14f8deab1737d9fabe', + '1.27': 'kindest/node:v1.27.17@sha256:3fd82731af34efe19cd54ea5c25e882985bafa2c9baefe14f8deab1737d9fabe', + '1.26.15': 'kindest/node:v1.26.15@sha256:1cc15d7b1edd2126ef051e359bf864f37bbcf1568e61be4d2ed1df7a3e87b354', + '1.26': 'kindest/node:v1.26.15@sha256:1cc15d7b1edd2126ef051e359bf864f37bbcf1568e61be4d2ed1df7a3e87b354', + '1.25.16': 'kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025', + '1.25': 'kindest/node:v1.25.16@sha256:6110314339b3b44d10da7d27881849a87e092124afab5956f2e10ecdb463b025' ] ] def _kind_image = null @@ -86,20 +88,22 @@ pipeline { choice(name: 'KIND_VERSION', description: 'Kind version.', choices: [ - '0.23.0' + '0.24.0' ] ) choice(name: 'KUBE_VERSION', - description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.23.0: 1.30, 1.30.0, 1.29, 1.29.4, 1.28, 1.28.9, 1.27, 1.27.13, 1.26, 1.26.15, 1.25, 1.25.16 ', + description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.24.0: 1.31.0, 1.31, 1.30, 1.30.4, 1.29, 1.29.8, 1.28, 1.28.13, 1.27, 1.27.16, 1.26, 1.26.15, 1.25, 1.25.16 ', choices: [ // The first item in the list is the default value... - '1.30.0', + '1.31.0', + '1.31', + '1.30.4', '1.30', - '1.29.4', + '1.29.8', '1.29', - '1.28.9', + '1.28.13', '1.28', - '1.27.13', + '1.27.16', '1.27', '1.26.15', '1.26',