Skip to content

[OPENJDK-2992] Create DeploymentConfig and Route for jlink apps #514

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

Merged
merged 19 commits into from
Mar 3, 2025
+93 −10
Merged

[OPENJDK-2992] Create DeploymentConfig and Route for jlink apps #514

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c6b5fb1
Spec for deployment and route object
jhuttana Jun 10, 2024
1ceccb7
Correct apiVersion for deployment object
jhuttana Jun 10, 2024
60d1b9e
Change the image value to lightweight-image and also add imagePullPolicy
jhuttana Jun 10, 2024
464fcdc
Merge jaya changes
Josh-Matsuoka Oct 29, 2024
587d1f3
Rename created objects to follow unique naming convention
Josh-Matsuoka Nov 5, 2024
5af22fd
Convert to DeploymentConfig, cleanup
Josh-Matsuoka Nov 6, 2024
040ddca
Fix deploymentconfig
Josh-Matsuoka Nov 6, 2024
8d6cfea
Add ports to readme, fix Service
Josh-Matsuoka Nov 19, 2024
d747bc3
Add pod to template
Josh-Matsuoka Dec 18, 2024
adb47cc
Add new label to each created object to allow for easy filtering
Josh-Matsuoka Dec 18, 2024
b46af7a
Fix labels
Josh-Matsuoka Dec 18, 2024
58e62dc
Merge remote-tracking branch 'upstream2/jlink-dev' into jaya-cleanup
Josh-Matsuoka Jan 29, 2025
884c621
Rename ubi9 references to reflect tech preview
Josh-Matsuoka Jan 29, 2025
b45009c
revert image tag to latest
Josh-Matsuoka Feb 4, 2025
f48ffa2
use builder image tag parameter
Josh-Matsuoka Feb 4, 2025
94033a7
Merge remote-tracking branch 'upstream2/jlink-dev' into jaya-cleanup
Josh-Matsuoka Feb 26, 2025
9dce767
Update README with warning about projects, convert DeploymentConfig t…
Josh-Matsuoka Feb 26, 2025
7793e2a
README fixes
Josh-Matsuoka Feb 28, 2025
b474239
Merge changes from upstream
Josh-Matsuoka Mar 1, 2025
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
4 changes: 2 additions & 2 deletions templates/jlink/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ prepare UBI9 OpenJDK ImageStreams with `jlink-dev` support.

2. Within your OpenShift project,

oc create imagestream ubi9-openjdk-17
oc create imagestream openjdk-17-jlink-tech-preview

3. You may need to configure your container engine to not TLS-verify the OpenShift
registry. For Docker, add the following to `/etc/docker/daemon.json` and restart
Expand All @@ -37,7 +37,7 @@ prepare UBI9 OpenJDK ImageStreams with `jlink-dev` support.
5. tag and push the dev image into it. The OpenShift console gives you the
exact URI for your instance

docker tag ubi9/openjdk-17:1.18 default-route-openshift-image-registry.apps-crc.testing/jlink1/ubi9-openjdk-17:1.18
docker tag openjdk-tech-preview/openjdk-17-jlink-rhel9:1.18 default-route-openshift-image-registry.apps-crc.testing/jlink1/openjdk-17-jlink-tech-preview:1.18
docker push default-route-openshift-image-registry.apps-crc.testing/jlink1/ubi9-openjdk-17:1.18

## Stage 1: Load the template into OpenShift and instantiate it
Expand Down
12 changes: 6 additions & 6 deletions templates/jlink/jlinked-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ objects:
- apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink
name: ${APPNAME}-openjdk-${JDK_VERSION}-jlink-tech-preview
labels:
app: ${APPNAME}
app.kubernetes.io/part-of: ${APPNAME}
Expand Down Expand Up @@ -86,18 +86,18 @@ objects:
dockerStrategy:
from:
kind: ImageStreamTag
name: ubi9-openjdk-${JDK_VERSION}:${BUILDER_IMAGE_TAG} # Refer README.md to create this ImageStream
name: openjdk-${JDK_VERSION}-jlink-tech-preview:1.18 # Refer README.md to create this ImageStream
output:
to:
kind: ImageStreamTag
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink:latest
name: ${APPNAME}-openjdk-${JDK_VERSION}-jlink-tech-preview:latest
triggers:
- type: ConfigChange
- type: ImageChange
imageChange:
from:
kind: ImageStreamTag
name: ubi9-openjdk-${JDK_VERSION}:${BUILDER_IMAGE_TAG}
name: openjdk-${JDK_VERSION}-jlink-tech-preview:${BUILDER_IMAGE_TAG}
##############################################################################
# stage-2: Output ImageStream
- apiVersion: image.openshift.io/v1
Expand Down Expand Up @@ -130,7 +130,7 @@ objects:
sourceStrategy:
from:
kind: ImageStreamTag
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output Imagestream from stage-1
name: ${APPNAME}-openjdk-${JDK_VERSION}-jlink-tech-preview:latest # Output Imagestream from stage-1
pullPolicy: Always
env:
- name: S2I_ENABLE_JLINK
Expand All @@ -147,7 +147,7 @@ objects:
imageChange:
from:
kind: ImageStreamTag
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output of stage-1 which serves as input to stage-2
name: ${APPNAME}-openjdk-${JDK_VERSION}-jlink-tech-preview:latest # Output of stage-1 which serves as input to stage-2
- type: GitHub
github:
secret: ${GITHUB_WEBHOOK_SECRET}
Expand Down