Skip to content

Consolidate on-prem-installer deb packages #363

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.

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

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Conversation

ahalimx86
Copy link
Contributor

@ahalimx86 ahalimx86 commented May 26, 2025

Description

Consolidate on-prem-installer deb packages:

  • Move gitea into argocd
  • Move os-config into RKE2 installer

This PR depends on #352 which needs to be merged first

Fixes # (issue)

Any Newly Introduced Dependencies

Please describe any newly introduced 3rd party dependencies in this change. List their name, license information and how they are used in the project.

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Checklist:

  • I agree to use the APACHE-2.0 license for my code changes
  • I have not introduced any 3rd party dependency changes
  • I have performed a self-review of my code

ahalimx86 added 15 commits May 22, 2025 14:13
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
@ahalimx86 ahalimx86 changed the title [WIP] remove onprem os-config installer from install/uninstall scripts [WIP] move on-prem config installer into onprem-ke installer May 26, 2025
@ajaythakurintel ajaythakurintel added this to the 3.1 milestone May 28, 2025
@ahalimx86 ahalimx86 changed the base branch from ah_consolidate_installers to main May 29, 2025 14:35
ahalimx86 added 2 commits May 30, 2025 08:27
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
@ahalimx86 ahalimx86 marked this pull request as ready for review May 30, 2025 09:18
@ahalimx86 ahalimx86 changed the title [WIP] move on-prem config installer into onprem-ke installer Consolidate on-prem-installer deb packages May 30, 2025
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
@se-chris-thach
Copy link
Contributor

Reviewing now

Copy link
Contributor

@se-chris-thach se-chris-thach left a comment

Choose a reason for hiding this comment

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

LGTM. These are some non-blocking comments but looks good otherwise

🥇

Comment on lines +25 to +27
# disable loading of kernel modules at boot
rm -fr /etc/modules-load.d/lv-snapshots.conf

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# disable loading of kernel modules at boot
rm -fr /etc/modules-load.d/lv-snapshots.conf

This should have been removed since we don't use LVM anymore.

Or it can be done in #381

FYI @garyloug

Comment on lines +139 to +161
// Enable kernel modules required for LV snapshots
func configModules() error {
fmt.Println("config kernel modules...")

mods, err := os.OpenFile("/etc/modules-load.d/lv-snapshots.conf", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644)
if err != nil {
return err
}
defer mods.Close()

if _, err = mods.WriteString("dm-snapshot\ndm-mirror\n"); err != nil {
return err
}

if err = sh.RunV("modprobe", "dm-snapshot"); err != nil {
return err
}
if err = sh.RunV("modprobe", "dm-mirror"); err != nil {
return err
}

return nil
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This will also be deleted in #381

Comment on lines +102 to +103
"-d", "jq,libpq5,apparmor,lvm2,mosquitto,net-tools,ntp,openssh-server", //nolint:misspell
"-d", "software-properties-common,tpm2-abrmd,tpm2-tools,unzip",
Copy link
Contributor

Choose a reason for hiding this comment

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

curious, where did these deps come from? We can probably audit and remove these later.

Like how does RKE2 depend on openssh-server? 😆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants