From 33bab592098c1d3e55ca049318427c9e21e3c2b3 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Tue, 14 Nov 2023 14:16:39 +0100
Subject: [PATCH] deps: bump JKube base images to 0.0.21

Base images are now based on ubi9

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 CHANGELOG.md                                                  | 1 +
 jkube-kit/parent/pom.xml                                      | 2 +-
 .../kit/remotedev/KubernetesSshServiceForwarderTest.java      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b5b9dd2b1..6483991037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Usage:
 ./scripts/extract-changelog-for-version.sh 1.3.37 5
 ```
 ### 1.16-SNAPSHOT
+* Fix #1690: Base images based on ubi9
 
 ### 1.15.0 (2023-11-10)
 * Fix #2138: Support for Spring Boot Native Image
diff --git a/jkube-kit/parent/pom.xml b/jkube-kit/parent/pom.xml
index abfb662029..d7273383c2 100644
--- a/jkube-kit/parent/pom.xml
+++ b/jkube-kit/parent/pom.xml
@@ -64,7 +64,7 @@
     <version.ow2.asm>9.5</version.ow2.asm>
 
     <!-- =======================================================  -->
-    <version.image.jkube-images>0.0.20</version.image.jkube-images>
+    <version.image.jkube-images>0.0.21</version.image.jkube-images>
     <version.image.ubi-minimal>9.3</version.image.ubi-minimal>
     <!-- === Java base image versions for docker, s2i (istag == s2i) -->
     <!-- Upstream -->
diff --git a/jkube-kit/remote-dev/src/test/java/org/eclipse/jkube/kit/remotedev/KubernetesSshServiceForwarderTest.java b/jkube-kit/remote-dev/src/test/java/org/eclipse/jkube/kit/remotedev/KubernetesSshServiceForwarderTest.java
index cba5aec98f..8f7b50612e 100644
--- a/jkube-kit/remote-dev/src/test/java/org/eclipse/jkube/kit/remotedev/KubernetesSshServiceForwarderTest.java
+++ b/jkube-kit/remote-dev/src/test/java/org/eclipse/jkube/kit/remotedev/KubernetesSshServiceForwarderTest.java
@@ -70,7 +70,7 @@ void tearDown() {
   }
 
   @Test
-  @DisplayName("deploys Pod with image: quay.io/jkube/jkube-remote-dev:0.0.20")
+  @DisplayName("deploys Pod with image: quay.io/jkube/jkube-remote-dev:0.0.21")
   void deployPodWithImage() {
     // When
     executorService.submit(kubernetesSshServiceForwarder);
@@ -86,7 +86,7 @@ void deployPodWithImage() {
       .extracting(PodSpec::getContainers)
       .asList()
       .singleElement()
-      .hasFieldOrPropertyWithValue("image", "quay.io/jkube/jkube-remote-dev:0.0.20");
+      .hasFieldOrPropertyWithValue("image", "quay.io/jkube/jkube-remote-dev:0.0.21");
   }
   @Test
   @DisplayName("deploys Pod with port definitions")