[JENKINS-73703] Add agent images for UBI 9 #866

adambkaplan · 2024-08-29T19:27:07Z

Add agent and inbound-agent images for RHEL, based on UBI 9. The base images are part of the UBI catalog. Therefore, the resulting images are free to redistribute anywhere (no subscription or terms agreement required).

Based on initial feedback from the community, these images use the same scripts to install and shrink the JRE that the image uses at runtime, rather than the respective version of OpenJDK packaged by Red Hat.

Testing done

I verified locally that the agent images build with podman, and that when run as a container the agents can communicate with an appropriately configured Jenkins controller/server.

Submitter checklist

Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
Ensure that the pull request title represents the desired changelog entry
Please describe what you did
Link to relevant issues in GitHub or Jira
Link to relevant pull requests, esp. upstream and downstream changes
Ensure you have provided tests - that demonstrates feature works or fixes the issue

dduportal · 2024-08-29T19:54:48Z

Thanks for the contribution !

a quick first feedback (need to take a look) : the Jenkins uses Temurin JDK so we would like to use it here as well.
Changing the JDK distribution for only one declination is a nightmare to manage : updates, CVEs, patches, tests etc.

would you be willing to switch back to Temurin ?

dduportal · 2024-09-10T16:19:44Z

Hi @adambkaplan , as discussed during the Jenkins Platform SIG meeting today:

We are good with adding UBI9 image for the agents
But we won't accept a new JDK distribution other than Temurin (same model as other images) for the reasons I exposed on my previous comment (maintenance burden for us).

Is that OK for you to update your PR to match the JDK pattern of other images (current UBI or Debian)?

adambkaplan · 2024-09-11T18:01:55Z

Is that OK for you to update your PR to match the JDK pattern of other images (current UBI or Debian)?

Happy to match the JDK pattern for the controller's UBI image. I can completely understand the need to keep things in sync when it comes to testing, verification, and patching.

gounthar · 2024-09-11T18:23:08Z

Thank you so much. 🤗

adambkaplan · 2024-09-12T14:02:50Z

@gounthar @dduportal updated the PR to use the Temurin JDK, using the same scripts as the other agent images. Was able to verify the controller-agent connection works for the inbound flavor of the image locally.

I tried to update docker-bake and the README, but I'm a bit shakier on those as I don't have docker on my local machine. PTAL - after this next set of review I can squash commits and take this PR out of the draft state.

gounthar · 2024-09-12T16:29:53Z

Thanks, I will have a look. 👍

adambkaplan · 2024-09-23T14:21:21Z

@gounthar I have squashed commits, rebased this PR, and taken it out of draft state. PTAL.

MarkEWaite · 2024-09-23T15:29:51Z

Thanks very much @adambkaplan !

I'm a little surprised at the addition of UBI 8 + Java 11. Jenkins weekly has not supported Java 11 since 18 Jun 2024 (Jenkins 2.463). Jenkins LTS 2.477.1 will not support Java 11 when it releases 30 Oct 2024. Current Jenkins LTS (2.462.2) supports Java 11 and the 2 Oct 2024 Jenkins LTS (2.462.3) will support Java 11, but those will be the last LTS versions to support Java 11.

Jenkins does not support running a Jenkins agent with an older Java major version than the Java major version that is used on the controller.

That doesn't mean that we should not add a UBI 8 + Java 11 agent container, but the usable life of that container image seems much smaller than the UBI 9 + Java 17 and UBI 9 + Java 21 container images.

Is there a larger story behind the inclusion of an agent image for UBI 8 + Java 11?

adambkaplan · 2024-09-23T18:57:57Z

Is there a larger story behind the inclusion of an agent image for UBI 8 + Java 11?

Not really. The present change set is meant to provide the same set of base OS + JREs for the agent that the community is providing for the main server. If the community plans on dropping UBI 8 support when Java 11 reaches EOL (effectively next week), then I agree it doesn't make sense to build an agent image now.

timja · 2024-09-23T19:26:24Z

Could you drop it please

adambkaplan · 2024-09-23T21:48:20Z

Could you drop it please

Done!

README_agent.md

docker-bake.hcl

rhel/ubi9/Dockerfile

MarkEWaite

All my remaining comments are optional. This is ready to merge once CI job passes.

docker-bake.hcl

rhel/ubi9/Dockerfile

lemeurherveCB

Small suggestions.

docker-bake.hcl

rhel/ubi9/Dockerfile

lemeurherveCB · 2024-09-24T09:53:44Z

docker-bake.hcl

If the ARG UBI9_TAG suggestion is accepted, it should also be defined as a variable here and passed to the corresponding target like what is done for DEBIAN_RELEASE.

Accepting the suggestion, thus I'll add a follow-up commit with the new variable.

lemeurherveCB · 2024-09-24T10:36:47Z

.github/dependabot.yml

+# Red Hat Enterprise Linux Universal Base Image
+
+- package-ecosystem: docker
+  directory: "rhel"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 2
+  target-branch: master
+  reviewers:
+  - MarkEWaite
+  labels:
+  - dependencies
+


Suggested change

# Red Hat Enterprise Linux Universal Base Image

- package-ecosystem: docker

directory: "rhel"

schedule:

interval: weekly

open-pull-requests-limit: 2

target-branch: master

reviewers:

- MarkEWaite

labels:

- dependencies

Cf #866 (comment), removing this in favor of an updatecli manifest which can be added in a follow-up pull request.

Note that some content above should be removed too (unrelated to this PR)

Note that some content above should be removed too (unrelated to this PR)

Addressed in #877

Add agent and inbound-agent images for RHEL, based on UBI 8 and UBI 9. The standard UBI image is used as the base, making the resulting images free to redistribute anywhere (no subscription or terms agreement required). Like the other docker-agent images, these download and shrink the Adoptium JDK instead of using the default openjdk packages in the OS distribution. Signed-off-by: Adam Kaplan <adam.kaplan@redhat.com>

With the upcoming EOL of Java 11, the UBI 8 image for Jenkins server will no longer be supported. Creating a UBI 8 image therefore does not make any sense. The tag for the base UBI 9 image was converted to a build arg, to facilitate automatic updates via updatecli. Other minor fixes to documentation and image metadata also included. Signed-off-by: Adam Kaplan <adam.kaplan@redhat.com> Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> Co-authored-by: lemeurherveCB <137290663+lemeurherveCB@users.noreply.github.com>

adambkaplan · 2024-09-24T13:26:40Z

Rebased and squashed commits down to 2 (preserving the decisions around UBI 8 and updatecli). Thanks everyone!

MarkEWaite

Thanks!

adambkaplan force-pushed the ubi9-agent branch 2 times, most recently from c0f13fb to b356f11 Compare September 23, 2024 14:16

adambkaplan marked this pull request as ready for review September 23, 2024 14:17

adambkaplan requested a review from a team as a code owner September 23, 2024 14:17

adambkaplan changed the title ~~WIP - [JENKINS-73703] Add Agent Images for UBI9~~ [JENKINS-73703] Add Agent Images for UBI 8 and UBI 9 Sep 23, 2024

MarkEWaite changed the title ~~[JENKINS-73703] Add Agent Images for UBI 8 and UBI 9~~ [JENKINS-73703] Add agent images for UBI 9 Sep 23, 2024

MarkEWaite requested changes Sep 23, 2024

View reviewed changes

MarkEWaite previously approved these changes Sep 23, 2024

View reviewed changes

docker-bake.hcl Outdated Show resolved Hide resolved

rhel/ubi9/Dockerfile Show resolved Hide resolved

MarkEWaite dismissed their stale review via 79ce4c8 September 24, 2024 00:31

MarkEWaite previously approved these changes Sep 24, 2024

View reviewed changes

dduportal previously approved these changes Sep 24, 2024

View reviewed changes

lemeurherveCB reviewed Sep 24, 2024

View reviewed changes

lemeurherveCB mentioned this pull request Sep 24, 2024

cleanup: remove from dependabot the dependencies tracked by updatecli #877

Merged

6 tasks

MarkEWaite dismissed stale reviews from dduportal and themself via 3dab086 September 24, 2024 12:55

adambkaplan and others added 2 commits September 24, 2024 09:13

adambkaplan force-pushed the ubi9-agent branch from 29053db to 4fc76bf Compare September 24, 2024 13:22

dduportal approved these changes Sep 24, 2024

View reviewed changes

MarkEWaite approved these changes Sep 24, 2024

View reviewed changes

lemeurherveCB approved these changes Sep 24, 2024

View reviewed changes

MarkEWaite added the enhancement label Sep 24, 2024

MarkEWaite merged commit 350499f into jenkinsci:master Sep 24, 2024
10 checks passed

adambkaplan deleted the ubi9-agent branch September 24, 2024 14:50

This was referenced Sep 24, 2024

chore: follow-up of UBI9 image introduction #880

Merged

Add an updatecli manifest to track UBI9 docker image version #883

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-73703] Add agent images for UBI 9 #866

[JENKINS-73703] Add agent images for UBI 9 #866

adambkaplan commented Aug 29, 2024 •

edited by MarkEWaite

Loading

dduportal commented Aug 29, 2024 •

edited

Loading

dduportal commented Sep 10, 2024

adambkaplan commented Sep 11, 2024

gounthar commented Sep 11, 2024

adambkaplan commented Sep 12, 2024

gounthar commented Sep 12, 2024

adambkaplan commented Sep 23, 2024

MarkEWaite commented Sep 23, 2024 •

edited

Loading

adambkaplan commented Sep 23, 2024

timja commented Sep 23, 2024

adambkaplan commented Sep 23, 2024

MarkEWaite left a comment

lemeurherveCB left a comment

lemeurherveCB Sep 24, 2024

adambkaplan Sep 24, 2024

lemeurherveCB Sep 24, 2024

lemeurherveCB Sep 24, 2024

lemeurherveCB Sep 24, 2024

adambkaplan commented Sep 24, 2024

MarkEWaite left a comment

[JENKINS-73703] Add agent images for UBI 9 #866

[JENKINS-73703] Add agent images for UBI 9 #866

Conversation

adambkaplan commented Aug 29, 2024 • edited by MarkEWaite Loading

Testing done

Submitter checklist

dduportal commented Aug 29, 2024 • edited Loading

dduportal commented Sep 10, 2024

adambkaplan commented Sep 11, 2024

gounthar commented Sep 11, 2024

adambkaplan commented Sep 12, 2024

gounthar commented Sep 12, 2024

adambkaplan commented Sep 23, 2024

MarkEWaite commented Sep 23, 2024 • edited Loading

adambkaplan commented Sep 23, 2024

timja commented Sep 23, 2024

adambkaplan commented Sep 23, 2024

MarkEWaite left a comment

Choose a reason for hiding this comment

lemeurherveCB left a comment

Choose a reason for hiding this comment

lemeurherveCB Sep 24, 2024

Choose a reason for hiding this comment

adambkaplan Sep 24, 2024

Choose a reason for hiding this comment

lemeurherveCB Sep 24, 2024

Choose a reason for hiding this comment

lemeurherveCB Sep 24, 2024

Choose a reason for hiding this comment

lemeurherveCB Sep 24, 2024

Choose a reason for hiding this comment

adambkaplan commented Sep 24, 2024

MarkEWaite left a comment

Choose a reason for hiding this comment

adambkaplan commented Aug 29, 2024 •

edited by MarkEWaite

Loading

dduportal commented Aug 29, 2024 •

edited

Loading

MarkEWaite commented Sep 23, 2024 •

edited

Loading