From 55f2d48611500352f55c6cbaff15b411dcd07a85 Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Sun, 12 May 2024 17:03:09 +0800 Subject: [PATCH] Bump plugin to default to Java 17+ compatibility Defaults to an agent container image which will only work with GoCD 21.4.0+ --- build.gradle | 4 ++-- .../cd/go/contrib/elasticagent/KubernetesInstanceFactory.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5e9fa429..c5b5fbd9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,8 +20,8 @@ apply from: "https://raw.githubusercontent.com/gocd/gocd-plugin-gradle-task-help gocdPlugin { id = 'cd.go.contrib.elasticagent.kubernetes' - pluginVersion = '4.0.0' - goCdVersion = '20.9.0' + pluginVersion = '4.1.0' + goCdVersion = '21.4.0' name = 'Kubernetes Elastic Agent Plugin' description = 'Kubernetes Based Elastic Agent Plugins for GoCD' vendorName = 'Thoughtworks, Inc.' diff --git a/src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java b/src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java index abda0306..2f47abbf 100644 --- a/src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java +++ b/src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java @@ -300,8 +300,8 @@ private static Map getJinJavaContext() { HashMap context = new HashMap<>(); context.put(POD_POSTFIX, UUID.randomUUID().toString()); context.put(CONTAINER_POSTFIX, UUID.randomUUID().toString()); - context.put(GOCD_AGENT_IMAGE, "gocd/gocd-agent-alpine-3.19"); - context.put(LATEST_VERSION, "v23.5.0"); + context.put(GOCD_AGENT_IMAGE, "gocd/gocd-agent-wolfi"); + context.put(LATEST_VERSION, "v24.1.0"); return context; } }