feat: Support building offline OS bundles for Oracle Linux 9.4 #1192

manoj-nutanix · 2024-09-30T11:06:36Z

What problem does this PR solve?:
Supports building offline OS bundle for Oracle Linux 9.4

Which issue(s) does this PR fix?:

https://jira.nutanix.com/browse/NCN-102633

Special notes for your reviewer:

Tested with CI jobs -

Pending:
Testing cluster creation using offline OS bundle.

Does this PR introduce a user-facing change?:

dkoshkin · 2024-09-30T16:26:23Z

The Containerd tar is named https://packages.d2iq.com/dkp/containerd/containerd-1.7.22-d2iq.1-ol-9.4-x86_64.tar.gz, but the e2e test automation assumes its this:

Downloading https://packages.d2iq.com/dkp/containerd/containerd-1.7.22-d2iq.1-oracle-9.4-x86_64.tar.gz to artifacts/containerd-1.7.22-d2iq.1-oracle-9.4-x86_64.tar.gz

https://github.com/mesosphere/konvoy-image-builder/actions/runs/11105421677/job/30851548106#step:10:1693

You'll want another change to replace oracle with ol in

konvoy-image-builder/magefile.go

Line 454 in 4f29942

osDist = strings.Replace(osDist, "redhat", "rhel", 1)

manoj-nutanix · 2024-09-30T16:35:05Z

The Containerd tar is named https://packages.d2iq.com/dkp/containerd/containerd-1.7.22-d2iq.1-ol-9.4-x86_64.tar.gz, but the e2e test automation assumes its this:
Downloading https://packages.d2iq.com/dkp/containerd/containerd-1.7.22-d2iq.1-oracle-9.4-x86_64.tar.gz to artifacts/containerd-1.7.22-d2iq.1-oracle-9.4-x86_64.tar.gz
https://github.com/mesosphere/konvoy-image-builder/actions/runs/11105421677/job/30851548106#step:10:1693

You'll want another change to replace oracle with ol in

konvoy-image-builder/magefile.go

Line 454 in 4f29942

osDist = strings.Replace(osDist, "redhat", "rhel", 1)

Thanks, will make this change.. will go through e2e test to check the steps and packages it requires.

dkoshkin · 2024-09-30T17:30:09Z

(Updated the PR title because it gets used by automation for the release)

bundles/redhat8.6/packages.txt.gotmpl

manoj-nutanix · 2024-10-03T09:30:27Z

cmd/konvoy-image-wrapper/cmd/create-package-bundle.go

@@ -47,6 +47,10 @@ var osToConfig = map[string]OSConfig{
 		configDir:      "bundles/ubuntu20.04",
 		containerImage: "docker.io/library/ubuntu:20.04",
 	},
+	"oracle-9.4": {
+		configDir:      "bundles/oracle9.4",
+		containerImage: "docker.io/library/oraclelinux:9",


the minor version container images have not been released yet on any registry(ref) so using this image which currently points to 9.4 only -

[root@8b53e13be278 generated]# cat /etc/oracle-release Oracle Linux Server release 9.4 [root@8b53e13be278 generated]# cat /etc/redhat-release Red Hat Enterprise Linux release 9.4 (Plow) [root@8b53e13be278 generated]# cat /etc/os-release NAME="Oracle Linux Server" VERSION="9.4" ID="ol" ID_LIKE="fedora" VARIANT="Server" VARIANT_ID="server" VERSION_ID="9.4" PLATFORM_ID="platform:el9" PRETTY_NAME="Oracle Linux Server 9.4" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:oracle:linux:9:4:server" HOME_URL="https://linux.oracle.com/" BUG_REPORT_URL="https://github.com/oracle/oracle-linux" ORACLE_BUGZILLA_PRODUCT="Oracle Linux 9" ORACLE_BUGZILLA_PRODUCT_VERSION=9.4 ORACLE_SUPPORT_PRODUCT="Oracle Linux" ORACLE_SUPPORT_PRODUCT_VERSION=9.4

we can update the image tag once 9.4 version is released on their official registry/repo -

https://container-registry.oracle.com/ords/f?p=113:4:10433988665656:::4:P4_REPOSITORY,AI_REPOSITORY,AI_REPOSITORY_NAME,P4_REPOSITORY_NAME,P4_EULA_ID,P4_BUSINESS_AREA_ID:1,1,Oracle%20Linux,Oracle%20Linux,1,0&cs=3GLgmu4zPDtIjZjF1cXhfpBMVzRl0Sefp1HfIY1Aw88xKXzFyVBlZp58aVGnejQ6Yin9zyBXV3AgvO8P-JhWwgw

https://github.com/oracle/container-images/pkgs/container/oraclelinux

Alternatively we can peg image tag to specific SHA but I'm skeptical about reliability of SHA tags to be generally available all time -

.pre-commit-config.yaml

dkoshkin · 2024-10-03T16:56:03Z

Looks great, I just merged #1190, can you please rebase on main.
You can also remove the non-offline tests from the GHA files (like we have for the other OSs), I don't think we need both in there.

kevinantonythomas

LGTM. But will let someone who knows this code to appprove

feat: add Oracle Linux 9.4 vSphere build configuration

manoj-nutanix · 2024-10-03T17:58:46Z

Looks great, I just merged #1190, can you please rebase on main. You can also remove the non-offline tests from the GHA files (like we have for the other OSs), I don't think we need both in there.

rebased and removed the non-offline tests for oracle-9.4 .. I suppose there would some e2e test covering both offline and non-offline modes of OS image as there're few ansible tasks which are specific to modes so confirming.

.github/workflows/release-vsphere-template.yaml

.github/workflows/vsphere-e2e.yaml

ansible/roles/containerd/tasks/redhat.yaml

…line modes

… tests GHA

supershal · 2024-10-04T20:00:15Z

Running vsphere e2e tests. Good to merge if those are successful for Oracle 9.4: https://github.com/mesosphere/konvoy-image-builder/actions/runs/11186167572/

dkoshkin · 2024-10-04T20:31:55Z

ansible/roles/containerd/tasks/redhat.yaml

  yum:
    name: "{{ item }}"
    state: present
    update_cache: true
+    enablerepo: "{{ 'offline' if offline_mode_enabled else '' }}"
+    disablerepo: "{{ '*' if offline_mode_enabled else '' }}"


Good catch.

manoj-nutanix force-pushed the NCN-102633 branch 2 times, most recently from 8a152c7 to 49ab833 Compare September 30, 2024 11:44

dkoshkin changed the title ~~[WIP] NCN-102633: Support building offline OS bundles for Oracle Linux 9.4~~ [WIP] feat: Support building offline OS bundles for Oracle Linux 9.4 Sep 30, 2024

manoj-nutanix force-pushed the NCN-102633 branch 6 times, most recently from cea4732 to 6418213 Compare October 3, 2024 09:20

manoj-nutanix commented Oct 3, 2024

View reviewed changes

bundles/redhat8.6/packages.txt.gotmpl Show resolved Hide resolved

manoj-nutanix commented Oct 3, 2024

View reviewed changes

manoj-nutanix marked this pull request as ready for review October 3, 2024 10:16

manoj-nutanix requested review from dkoshkin, supershal, kevinantonythomas and legacyrj October 3, 2024 10:17

manoj-nutanix commented Oct 3, 2024

View reviewed changes

.pre-commit-config.yaml Outdated Show resolved Hide resolved

manoj-nutanix changed the title ~~[WIP] feat: Support building offline OS bundles for Oracle Linux 9.4~~ feat: Support building offline OS bundles for Oracle Linux 9.4 Oct 3, 2024

github-actions bot added the feature label Oct 3, 2024

kevinantonythomas reviewed Oct 3, 2024

View reviewed changes

manoj-nutanix added 4 commits October 3, 2024 23:04

feat: Builds oracle-9.4 offline package

4fe250b

feat: add Oracle Linux 9.4 vSphere build configuration

chore: removed debug statement and comments from GHA

eb03f98

removes pre-commit changes

1cfdfac

removes the non-offline oracle-9.4 tests from the GHA files

7372190

manoj-nutanix force-pushed the NCN-102633 branch from 4da94b8 to 7372190 Compare October 3, 2024 17:47

supershal reviewed Oct 3, 2024

View reviewed changes

.github/workflows/release-vsphere-template.yaml Show resolved Hide resolved

supershal reviewed Oct 3, 2024

View reviewed changes

.github/workflows/vsphere-e2e.yaml Show resolved Hide resolved

supershal requested changes Oct 3, 2024

View reviewed changes

ansible/roles/containerd/tasks/redhat.yaml Outdated Show resolved Hide resolved

manoj-nutanix force-pushed the NCN-102633 branch from 14d126d to cfa26ed Compare October 4, 2024 05:27

manoj-nutanix added 2 commits October 4, 2024 12:04

installs tar and container-selinux packages for oracle-9.4 offline/on…

f59ff61

…line modes

Adds online modes 'basic' and 'fips' for oracle-9.4 on vsphere to e2e…

f521da9

… tests GHA

manoj-nutanix force-pushed the NCN-102633 branch from cfa26ed to f521da9 Compare October 4, 2024 06:38

github-actions bot added feature and removed feature labels Oct 4, 2024

manoj-nutanix requested a review from supershal October 4, 2024 10:38

supershal added the runs-vsphere-tests runs the vsphere e2e tests label Oct 4, 2024

supershal approved these changes Oct 4, 2024

View reviewed changes

dkoshkin approved these changes Oct 4, 2024

View reviewed changes

manoj-nutanix merged commit f8da088 into main Oct 7, 2024
29 checks passed

manoj-nutanix deleted the NCN-102633 branch October 7, 2024 05:53

mesosphere-ci mentioned this pull request Oct 7, 2024

chore(main): release 2.16.0 #1193

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Support building offline OS bundles for Oracle Linux 9.4 #1192

feat: Support building offline OS bundles for Oracle Linux 9.4 #1192

manoj-nutanix commented Sep 30, 2024 •

edited

Loading

dkoshkin commented Sep 30, 2024

manoj-nutanix commented Sep 30, 2024

dkoshkin commented Sep 30, 2024

manoj-nutanix Oct 3, 2024

manoj-nutanix Oct 3, 2024

dkoshkin commented Oct 3, 2024

kevinantonythomas left a comment

manoj-nutanix commented Oct 3, 2024 •

edited

Loading

supershal commented Oct 4, 2024

dkoshkin Oct 4, 2024

feat: Support building offline OS bundles for Oracle Linux 9.4 #1192

feat: Support building offline OS bundles for Oracle Linux 9.4 #1192

Conversation

manoj-nutanix commented Sep 30, 2024 • edited Loading

dkoshkin commented Sep 30, 2024

manoj-nutanix commented Sep 30, 2024

dkoshkin commented Sep 30, 2024

manoj-nutanix Oct 3, 2024

Choose a reason for hiding this comment

manoj-nutanix Oct 3, 2024

Choose a reason for hiding this comment

dkoshkin commented Oct 3, 2024

kevinantonythomas left a comment

Choose a reason for hiding this comment

manoj-nutanix commented Oct 3, 2024 • edited Loading

supershal commented Oct 4, 2024

dkoshkin Oct 4, 2024

Choose a reason for hiding this comment

manoj-nutanix commented Sep 30, 2024 •

edited

Loading

manoj-nutanix commented Oct 3, 2024 •

edited

Loading