Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPENJDK-2734: Stage 2 initial implementation #474

Merged
merged 3 commits into from
Apr 4, 2024
Merged

OPENJDK-2734: Stage 2 initial implementation #474

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29fa4d4
Stage 2 initial implementation
Josh-Matsuoka Apr 4, 2024
7d669fb
stage2: Add an intermediate ImageStream and output to it
jmtd Apr 4, 2024
0970d20
stage2: fix indentation and quote "true"
jmtd Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions templates/jlink/jlink-builder/jlink-builder-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ parameters:
name: JDK_VERSION
value: "11"
required: true
- description: Application to run the jlink workflow on
name: APPLICATION
required: true
- description: Git Ref to run the jlink workflow on
name: REF
required: true
- description: Context Dir to use for the jlink workflow
name: CONTEXT_DIR
required: true
objects:
- apiVersion: image.openshift.io/v1
kind: ImageStream
Expand Down Expand Up @@ -49,3 +58,31 @@ objects:
to:
kind: ImageStreamTag
name: ubi9-openjdk-${JDK_VERSION}-jlink:latest
- apiVersion: build.openshift.io/v1
kind: BuildConfig
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BuildConfig is OpenShift specific. It would be best to design this based on Builds for Red Hat OpenShift which is k8s specific which covers a broader range of deployments and would be more forward-looking:
https://access.redhat.com/documentation/en-us/builds_for_red_hat_openshift/1.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to move to Build instead of buildConfig, yes (also in #471). I won't block merging this to jlink-dev for that reason, though, it goes on the TODO list.

metadata:
name: jlink-s2i-jdk-${JDK_VERSION}
labels:
app: jlink-s2i-jdk-${JDK_VERSION}
spec:
source:
type: Git
git:
jmtd marked this conversation as resolved.
Show resolved Hide resolved
uri: ${APPLICATION}
ref: ${REF}
contextDir: ${CONTEXT_DIR}
strategy:
sourceStrategy:
from:
kind: ImageStreamTag
name: ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output Imagestream for Stage 1
pullPolicy: Always
env:
- name: S2I_ENABLE_JLINK
value: true
- name: LOGGING_SCRIPT_DEBUG
value: true
output:
to:
kind: ImageStreamTag
name: ubi9-openjdk-${JDK_VERSION}-jlink:latest
jmtd marked this conversation as resolved.
Show resolved Hide resolved
Loading