webhook: should also consider the old Spec.Filesystem.Provisioned

- sync the `Spec.Provision` and `Spec.Filesystem.Provisioned` Signed-off-by: Vicente Cheng <[email protected]>
harvester · Oct 17, 2024 · e2ebe73 · e2ebe73
1 parent a835deb
commit e2ebe73
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/pkg/controller/blockdevice/controller.go b/pkg/controller/blockdevice/controller.go
@@ -218,7 +218,6 @@ func (c *Controller) generateProvisioner(device *diskv1.BlockDevice) (provisione
 	// upgrade case, we need to update some fields
 	if device.Spec.Provisioner == nil && device.Status.ProvisionPhase == diskv1.ProvisionPhaseProvisioned {
 		device.Spec.Provision = true
-		device.Spec.FileSystem.Provisioned = false
 		provisionerLHV1 := &diskv1.LonghornProvisionerInfo{
 			EngineVersion: provisioner.TypeLonghornV1,
 		}

diff --git a/pkg/provisioner/longhornv1.go b/pkg/provisioner/longhornv1.go
@@ -97,6 +97,8 @@ func (p *LonghornV1Provisioner) Provision() (bool, error) {
 	}
 
 	if (synced && !diskv1.DiskAddedToNode.IsTrue(p.device)) || provisioned {
+		// mark `filesystem.provisioned` to true, that the mutator could work
+		p.device.Spec.FileSystem.Provisioned = true
 		logrus.Debugf("Set blockdevice CRD (%v) to provisioned", p.device)
 		msg := fmt.Sprintf("Added disk %s to longhorn node `%s` as an additional disk", p.device.Name, p.nodeObj.Name)
 		setCondDiskAddedToNodeTrue(p.device, msg, diskv1.ProvisionPhaseProvisioned)
@@ -111,6 +113,7 @@ func (p *LonghornV1Provisioner) UnProvision() (bool, error) {
 
 	// inner functions
 	updateProvisionPhaseUnprovisioned := func() {
+		p.device.Spec.FileSystem.Provisioned = false
 		msg := fmt.Sprintf("Disk not in longhorn node `%s`", p.nodeObj.Name)
 		setCondDiskAddedToNodeFalse(p.device, msg, diskv1.ProvisionPhaseUnprovisioned)
 	}

diff --git a/pkg/webhook/blockdevice/mutator.go b/pkg/webhook/blockdevice/mutator.go
@@ -62,7 +62,7 @@ func (m *Mutator) Update(req *admission.Request, oldObj, newObj runtime.Object)
 		return patchOps, nil
 	}
 	// means we need to disable, align the .spec.filesystem.provisioned with .spec.provision -> false
-	if prevProvision && !newBd.Spec.FileSystem.Provisioned {
+	if prevProvision && !newBd.Spec.FileSystem.Provisioned && oldBd.Spec.FileSystem.Provisioned {
 		if newBd.Spec.Provision {
 			patchProvision := admission.PatchOp{
 				Op:    admission.PatchOpReplace,