From 0f81fd446856e79b2dbc26e4201f6d6415938bfd Mon Sep 17 00:00:00 2001
From: Lee Baines-dark <lee.baines-dark@forgerock.com>
Date: Thu, 4 Jul 2024 14:26:51 +0000
Subject: [PATCH] fix: Update 2nd openjdk entry and references

Update 2nd openjdk entry in Dockerile.
Update references using openjdk23.

ref: FORGEOPS-5166
---
 Dockerfile                                    | 2 +-
 charts/secret-agent/templates/deployment.yaml | 2 +-
 config/manager/kustomization.yaml             | 4 ++--
 config/manager/manager.yaml                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5149864..cd51fa7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,7 +61,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on go build -ldflags
 
 
 
-FROM openjdk:22-ea-15-jdk-slim-bullseye as release
+FROM openjdk:23-ea-15-jdk-slim-bullseye as release
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y lsof net-tools && \
diff --git a/charts/secret-agent/templates/deployment.yaml b/charts/secret-agent/templates/deployment.yaml
index e634b35..c4a489f 100644
--- a/charts/secret-agent/templates/deployment.yaml
+++ b/charts/secret-agent/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
           command:
             - /manager
           args:
-            - --keytoolPath=/usr/local/openjdk-22/bin/keytool
+            - --keytoolPath=/usr/local/openjdk-23/bin/keytool
             - --opensslPath=/usr/bin/openssl
             - --webhook-service-ns={{ .Release.Namespace }}
             - --webhook-service-name={{ include "secret-agent.fullname" . }}
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 5e793dd..dcadf9c 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: controller
-  newTag: latest
+  newName: us-docker.pkg.dev/forgeops-public/images/controller
+  newTag: jdk-v2
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index fa3b54e..c2eb777 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -35,7 +35,7 @@ spec:
       - command:
         - /manager
         args:
-        - --keytoolPath=/usr/local/openjdk-22/bin/keytool
+        - --keytoolPath=/usr/local/openjdk-23/bin/keytool
         - --opensslPath=/usr/bin/openssl
         - --webhook-service-ns=$(SERVICE_NAMESPACE)
         - --webhook-service-name=$(SERVICE_NAME)