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

Jump to bottom

45 support for garden linux images #46

Merged
merged 5 commits into from
Oct 1, 2024
Merged

45 support for garden linux images #46

merged 5 commits into from
Oct 1, 2024

Conversation

pnpavlov
Copy link
Contributor

@pnpavlov pnpavlov commented Sep 17, 2024 •
edited
Loading

Fixes: #45

Includes the dockerfiles used for publishing https://github.com/orgs/SAP/packages/container/sapmachine/versions?filters%5Bversion_type%5D=tagged and a skeleton for a GitHub action that can publish images for future SapMachine versions against a specific Garden Linux release.

It should be possible to test the workflow with something like, but not done because of permissions and not sure if this makes sense to run or should be enhanced further first.

gh workflow run publish-container-images.yaml -r 45-support-for-garden-linux-images -f sapMachineVersion=21 -f gardenLinuxVersion=1592

Test performed:

  1. CreatEd Gardener cluster with two nodes on arm64 and amd64
% kubectl get no -o wide
NAME            OS-IMAGE                    KERNEL-VERSION
ip-....internal Garden Linux 1592.1   6.6.47-cloud-arm64
ip-....internal Garden Linux 1592.1   6.6.47-cloud-amd64

then applying deployment with two replicas of ghcr.io/sap/sapmachine:21-jdk-gl-1592 with topologySpreadConstraints to make sure deployment happens to both nodes

% kubectl logs sapmachine21-7c6b9b7d96-44jdg
GL:
GARDENLINUX_CNAME=container-arm64-1592.1
Java:
OpenJDK Runtime Environment SapMachine (build 21.0.4+7-LTS)

% kubectl logs sapmachine21-7c6b9b7d96-6zddd 
GL:
GARDENLINUX_CNAME=container-amd64-1592.1
Java: 
OpenJDK Runtime Environment SapMachine (build 21.0.4+7-LTS)

skateball
skateball reviewed Sep 18, 2024
View reviewed changes
Copy link
Contributor

@skateball skateball left a comment

Choose a reason for hiding this comment

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

to me:

  • 22 is supported for two weeks => remove
  • 11 is supported until year end => remove
  • 17+21 should be enough, and for a BETA jdk-only should be okay
    @RealCLanger what do you think? what is about the changed debian install scripts?

@pnpavlov
Copy link
Contributor Author

Thanks, tried to follow the structure you have and keep it consistent with the rest of the Dockerfiles. I'm happy with all options:
a. Update the Garden Linux Dockerfiles to follow the installation procedure at https://github.com/SAP/SapMachine/wiki/Installation , then merge until you get the automation in place.
b. Publish as-is and then you overwrite them in consistent way with the alternatives for other OSes.
c. Close the PR without merging it and wait for the publishing of the Dockerfiles via your full automation.

As the change in the installation procedure should have to my understanding limited impact on the container base image consumer, it may be sufficient to enhance the Dockerfiles with next update by your automation and just overwrite them.

@RealCLanger
Copy link
Member

@pnpavlov I have now updated the script that generates the docker files and then generated the files. Please check and update this PR.

@pnpavlov pnpavlov closed this Sep 30, 2024
@pnpavlov pnpavlov force-pushed the 45-support-for-garden-linux-images branch from 515b898 to 156f322 Compare September 30, 2024 20:23
@pnpavlov pnpavlov reopened this Sep 30, 2024
@pnpavlov
Copy link
Contributor Author

@RealCLanger, PR updated to include only a .github/workflows/publish-container-images.yaml GH action. After merge, it should enable engineers with right level of access to trigger a release of individual SapMachine release based on specific Garden Linux version. Unfortunately afaik it's not possible to test by triggering the proposed GH Action from a PR (for good reasons).

Could you please review, merge, test if running the GH Action with sapMachineVersion: 23 and gardenLinuxVersion: 1592 produces as expected new tagged images in https://github.com/SAP/SapMachine/pkgs/container/sapmachine/versions?filters%5Bversion_type%5D=tagged. If granted permissions temporary in SapMachine-Infrastructure I'm happy to test myself too.

@RealCLanger RealCLanger merged commit 000d615 into SAP:master Oct 1, 2024
1 check passed
@pnpavlov pnpavlov mentioned this pull request Oct 7, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skateball skateball skateball left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support for Garden Linux images
3 participants
@pnpavlov @RealCLanger @skateball