Skip to content

Updated Red Hat mounts for air-gapped clusters #2391

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

Open
JunAr7112 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updated Red Hat mounts for air-gapped clusters #2391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions controllers/object_controls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,6 +3680,10 @@ func transformDriverContainer(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicy
if err != nil {
return fmt.Errorf("ERROR: failed to get path items for subscription entitlements: %v", err)
}
// Custom repo ConfigMap supplies yum repos in offline/air-gapped installs. Skip mounting host RHSM paths when using a custom repo ConfigMap
if config.Driver.RepoConfig != nil && config.Driver.RepoConfig.ConfigMapName != "" && osID == "rhel" {
pathToVolumeSource = MountPathToVolumeSource{}
}

// sort host path volumes to ensure ordering is preserved when adding to pod spec
mountPaths := make([]string, 0, len(pathToVolumeSource))
Expand Down
4 changes: 4 additions & 0 deletions internal/state/driver_volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@ func (s *stateDriver) getDriverAdditionalConfigs(ctx context.Context, cr *v1alph
if err != nil {
return nil, fmt.Errorf("ERROR: failed to get path items for subscription entitlements: %v", err)
}
// Custom repo ConfigMap supplies yum repos in offline/air-gapped installs. Skip mounting host RHSM paths when using a custom repo ConfigMap
if cr.Spec.IsRepoConfigEnabled() && pool.osRelease == "rhel" {
pathToVolumeSource = map[string]corev1.VolumeSource{}
}

// sort host path volumes to ensure ordering is preserved when adding to pod spec
mountPaths := make([]string, 0, len(pathToVolumeSource))
Expand Down