Skip to content

Commit 0318285

Browse files
authored
Merge pull request #1617 from snyk/fix/replace-opendjdk
fix: replaces openjdk with eclipse-temurin for system tests
2 parents 84bc6de + 9a99864 commit 0318285

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

.snyk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,16 @@ ignore:
2020
https://github.com/kubernetes-client/javascript/blob/master/FETCH_MIGRATION.md
2121
expires: 2025-01-10T12:00:00.000Z
2222
created: 2024-10-23T12:00:00.000Z
23+
SNYK-RHEL9-LIBXML2-13863026:
24+
- '*':
25+
reason: >-
26+
No fix available at this time
27+
expires: 2025-12-19T12:00:00.000Z
28+
created: 2025-11-19T12:00:00.000Z
29+
SNYK-PYTHON-SETUPTOOLS-7448482:
30+
- '*':
31+
reason: >-
32+
Introduced by Google Cloud SDK, waiting for upstream fix
33+
expires: 2025-12-19T12:00:00.000Z
34+
created: 2025-11-19T12:00:00.000Z
2335
patch: {}

test/fixtures/binaries-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ spec:
2424
ports:
2525
- containerPort: 80
2626
- name: openjdk
27-
image: docker.io/library/openjdk:14.0.1
28-
command: ['sh', '-c', 'echo Hello from openjdk:14 pod! && sleep 360000']
27+
image: eclipse-temurin:17-jre
28+
command: ['sh', '-c', 'echo Hello from eclipse-temurin:17 pod! && sleep 360000']

test/fixtures/java-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
imagePullSecrets:
1919
- name: docker-io
2020
containers:
21-
- image: docker.io/library/openjdk:latest
21+
- image: eclipse-temurin:17-jre
2222
imagePullPolicy: Always
2323
name: java
2424
command: ['/bin/sleep']

test/system/kind.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -245,29 +245,25 @@ test('Kubernetes-Monitor with KinD', async () => {
245245
type: 'imageNames',
246246
data: {
247247
names: [
248-
'docker.io/library/openjdk:latest',
249-
expect.stringContaining(
250-
'docker.io/library/openjdk@sha256:',
251-
),
252-
expect.stringContaining(
253-
'docker.io/library/openjdk@sha256:',
254-
),
248+
'eclipse-temurin:17-jre',
249+
expect.stringContaining('eclipse-temurin@sha256:'),
250+
expect.stringContaining('eclipse-temurin@sha256:'),
255251
],
256252
},
257253
},
258254
{
259255
type: 'ociDistributionMetadata',
260256
data: {
261-
imageTag: 'latest',
257+
imageTag: '17-jre',
262258
indexDigest: expect.stringContaining('sha256:'),
263259
manifestDigest: expect.stringContaining('sha256:'),
264260
registryHost: 'docker.io',
265-
repository: 'library/openjdk',
261+
repository: 'library/eclipse-temurin',
266262
},
267263
},
268264
]),
269-
target: { image: 'docker-image|docker.io/library/openjdk' },
270-
identity: { type: 'rpm', args: { platform: 'linux/amd64' } },
265+
target: { image: 'docker-image|eclipse-temurin' },
266+
identity: { type: 'deb', args: { platform: 'linux/amd64' } },
271267
},
272268
{
273269
facts: [
@@ -276,9 +272,9 @@ test('Kubernetes-Monitor with KinD', async () => {
276272
],
277273
identity: {
278274
type: 'maven',
279-
targetFile: '/usr/java/openjdk-18/lib',
275+
targetFile: expect.stringMatching('/opt/java/openjdk/lib'),
280276
},
281-
target: { image: 'docker-image|docker.io/library/openjdk' },
277+
target: { image: 'docker-image|eclipse-temurin' },
282278
},
283279
],
284280
});
@@ -294,7 +290,7 @@ test('Kubernetes-Monitor with KinD', async () => {
294290
expect(requestBody).toEqual<transmitterTypes.IDependencyGraphPayload>({
295291
agentId,
296292
dependencyGraph: expect.stringContaining(
297-
'docker-image|docker.io/library/openjdk',
293+
'docker-image|eclipse-temurin',
298294
),
299295
imageLocator: {
300296
userLocator: expect.any(String),

0 commit comments

Comments
 (0)