Skip to content

Commit d277642

Browse files
committed
resolve merge conflicts
Signed-off-by: Rahul Sharma <[email protected]>
1 parent 9652102 commit d277642

2 files changed

Lines changed: 0 additions & 10 deletions

File tree

‎controllers/object_controls.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3546,8 +3546,6 @@ func transformDriverContainer(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicy
35463546
}
35473547
}
35483548

3549-
<<<<<<< HEAD
3550-
=======
35513549
// Mount /lib/modules for precompiled drivers on SUSE distributions.
35523550
// Those containers need access to host /lib/modules at runtime.
35533551
osID := n.gpuNodeOSRelease
@@ -3572,7 +3570,6 @@ func transformDriverContainer(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicy
35723570
podSpec.Volumes = append(podSpec.Volumes, libModulesVol)
35733571
}
35743572

3575-
>>>>>>> 6afb20500 (store os release name and use it than recalculating from tag which is errorprone)
35763573
// no further repo configuration required when using pre-compiled drivers, return here.
35773574
if config.Driver.UsePrecompiledDrivers() {
35783575
return nil
@@ -3614,10 +3611,6 @@ func transformDriverContainer(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicy
36143611
}
36153612
}
36163613

3617-
<<<<<<< HEAD
3618-
osID := getOSName(n.gpuNodeOSTag)
3619-
=======
3620-
>>>>>>> 6afb20500 (store os release name and use it than recalculating from tag which is errorprone)
36213614
// set up subscription entitlements for RHEL(using K8s with a non-CRIO runtime) and SLES
36223615
if (osID == "rhel" && n.openshift == "" && n.runtime != gpuv1.CRIO) || osID == "sles" || osID == "sl-micro" {
36233616
n.logger.Info("Mounting subscriptions into the driver container", "OS", osID)

‎controllers/object_controls_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,8 +1884,6 @@ func TestMIGManager(t *testing.T) {
18841884
})
18851885
}
18861886
}
1887-
<<<<<<< HEAD
1888-
=======
18891887

18901888
// TestDriverPrecompiledLibModulesUbuntu tests that /lib/modules is NOT mounted for precompiled drivers on Ubuntu
18911889
func TestDriverPrecompiledLibModulesUbuntu(t *testing.T) {
@@ -1984,4 +1982,3 @@ func TestDriverPrecompiledLibModulesSuse(t *testing.T) {
19841982
})
19851983
}
19861984
}
1987-
>>>>>>> 6afb20500 (store os release name and use it than recalculating from tag which is errorprone)

0 commit comments

Comments
 (0)