Skip to content

Commit 91accca

Browse files
authored
Merge pull request #103 from nb-ohad/small-fixes
Driver Controller: Fix nil ref access and remove unnecessary mem copy
2 parents 21165ce + 09ad654 commit 91accca

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

internal/controller/driver_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ func (r *driverReconcile) reconcileNodePluginDeamonSet() error {
776776
kubeletDirPath := cmp.Or(pluginSpec.KubeletDirPath, defaultKubeletDirPath)
777777
forceKernelClient := r.isCephFsDriver() && r.driver.Spec.CephFsClientType == csiv1a1.KernelCephFsClient
778778

779-
topology := r.isRdbDriver() && r.driver.Spec.NodePlugin.Topology != nil
780-
domainLabels := ptr.Deref(pluginSpec.Topology, csiv1a1.TopologySpec{}).DomainLabels
779+
topology := r.isRdbDriver() && pluginSpec.Topology != nil
780+
domainLabels := cmp.Or(pluginSpec.Topology, &csiv1a1.TopologySpec{}).DomainLabels
781781

782782
daemonSet.Spec = appsv1.DaemonSetSpec{
783783
Selector: &metav1.LabelSelector{

0 commit comments

Comments
 (0)