Skip to content

Commit

Permalink
fix: Update 2nd openjdk entry and references
Browse files Browse the repository at this point in the history
Update 2nd openjdk entry in Dockerile.
Update references using openjdk23.

ref: FORGEOPS-5166
  • Loading branch information
lee-baines committed Jul 4, 2024
1 parent cc0323c commit 0f81fd4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion charts/secret-agent/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0f81fd4

Please sign in to comment.