Skip to content

Commit cc0323c

Browse files
authored
fix: Update JDK version to fix vulnerabilities (#275)
Update JDK version. ref: FORGEOPS-5166
1 parent a1c0dcb commit cc0323c

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.github/workflows/cluster_deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
- name: Install Kind and Create Cluster
1212
run: |
1313
set -o errexit
14-
curl -o kind -L https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64
14+
curl -o kind -L https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-amd64
1515
mkdir -p /opt/bin;
1616
install kind /opt/bin/
17-
/opt/bin/kind create cluster --image "kindest/node:v1.25.3"
17+
/opt/bin/kind create cluster --image "kindest/node:v1.30.0"
1818
- name: Build Secret Agent Image
1919
run: docker build -t controller:latest .
2020
- name: Load Secret Agent Image To Kind

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG GO_VERSION="1.22.2"
55
ARG GO_PACKAGE_SHA256="5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17"
66
ARG KUBEBUILDER_VERSION="3.1.0"
77

8-
FROM openjdk:22-ea-15-jdk-slim-bullseye as tester
8+
FROM openjdk:23-ea-15-jdk-slim-bullseye as tester
99

1010
ARG GO_VERSION
1111
ARG GO_PACKAGE_SHA256

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ ifndef DEFAULT_IMG_TAG
1010
DEFAULT_IMG_TAG=latest
1111
endif
1212
IMG ?= controller:${DEFAULT_IMG_TAG}
13+
# Uncomment below for deploying to a external cluster
14+
# IMG=${DEFAULT_IMG_REGISTRY}/${DEFAULT_IMG_REPOSITORY}/controller:${DEFAULT_IMG_TAG}
1315
VERSION=$(shell echo $(IMG) | awk -F ':' '{print $$2}')
1416
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
1517
#CRD_OPTIONS ?= "crd:trivialVersions=false"

config/crd/bases/secret-agent.secrets.forgerock.io_secretagentconfigurations.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ spec:
170170
items:
171171
type: string
172172
type: array
173+
userId:
174+
type: string
173175
type: object
174176
duration:
175177
type: string

0 commit comments

Comments
 (0)