Update generation when SELinuxMount is changed

openshift · Aug 4, 2022 · 189f19a · 189f19a
1 parent 3efeeef
commit 189f19a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pkg/registry/storage/csidriver/strategy.go b/pkg/registry/storage/csidriver/strategy.go
@@ -86,15 +86,17 @@ func (csiDriverStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.
 		newCSIDriver.Spec.VolumeLifecycleModes = nil
 	}
 
-	// Any changes to the mutable fields increment the generation number.
-	if !apiequality.Semantic.DeepEqual(oldCSIDriver.Spec.TokenRequests, newCSIDriver.Spec.TokenRequests) || !apiequality.Semantic.DeepEqual(oldCSIDriver.Spec.RequiresRepublish, newCSIDriver.Spec.RequiresRepublish) {
-		newCSIDriver.Generation = oldCSIDriver.Generation + 1
-	}
-
 	if oldCSIDriver.Spec.SELinuxMount == nil &&
 		!utilfeature.DefaultFeatureGate.Enabled(features.SELinuxMountReadWriteOncePod) {
 		newCSIDriver.Spec.SELinuxMount = nil
 	}
+
+	// Any changes to the mutable fields increment the generation number.
+	if !apiequality.Semantic.DeepEqual(oldCSIDriver.Spec.TokenRequests, newCSIDriver.Spec.TokenRequests) ||
+		!apiequality.Semantic.DeepEqual(oldCSIDriver.Spec.RequiresRepublish, newCSIDriver.Spec.RequiresRepublish) ||
+		!apiequality.Semantic.DeepEqual(oldCSIDriver.Spec.SELinuxMount, newCSIDriver.Spec.SELinuxMount) {
+		newCSIDriver.Generation = oldCSIDriver.Generation + 1
+	}
 }
 
 func (csiDriverStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList {

diff --git a/pkg/registry/storage/csidriver/strategy_test.go b/pkg/registry/storage/csidriver/strategy_test.go
@@ -287,41 +287,47 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
 			old:                                 driverWithNothing,
 			update:                              driverWithSELinuxMountEnabled,
 			wantSELinuxMount:                    &enabled,
+			wantGeneration:                      1,
 		},
 		{
 			name:                                "SELinux mount support feature enabled, before: off, update: on",
 			seLinuxMountReadWriteOncePodEnabled: true,
 			old:                                 driverWithSELinuxMountDisabled,
 			update:                              driverWithSELinuxMountEnabled,
 			wantSELinuxMount:                    &enabled,
+			wantGeneration:                      1,
 		},
 		{
 			name:                                "SELinux mount support feature enabled, before: on, update: off",
 			seLinuxMountReadWriteOncePodEnabled: true,
 			old:                                 driverWithSELinuxMountEnabled,
 			update:                              driverWithSELinuxMountDisabled,
 			wantSELinuxMount:                    &disabled,
+			wantGeneration:                      1,
 		},
 		{
 			name:                                "SELinux mount support feature disabled, before: nil, update: on",
 			seLinuxMountReadWriteOncePodEnabled: false,
 			old:                                 driverWithNothing,
 			update:                              driverWithSELinuxMountEnabled,
 			wantSELinuxMount:                    nil,
+			wantGeneration:                      0,
 		},
 		{
 			name:                                "SELinux mount support feature disabled, before: off, update: on",
 			seLinuxMountReadWriteOncePodEnabled: false,
 			old:                                 driverWithSELinuxMountDisabled,
 			update:                              driverWithSELinuxMountEnabled,
 			wantSELinuxMount:                    &enabled,
+			wantGeneration:                      1,
 		},
 		{
 			name:                                "SELinux mount support feature enabled, before: on, update: off",
 			seLinuxMountReadWriteOncePodEnabled: false,
 			old:                                 driverWithSELinuxMountEnabled,
 			update:                              driverWithSELinuxMountDisabled,
 			wantSELinuxMount:                    &disabled,
+			wantGeneration:                      1,
 		},
 	}
 
@@ -337,7 +343,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
 			require.Equal(t, test.wantModes, csiDriver.Spec.VolumeLifecycleModes)
 			require.Equal(t, test.wantTokenRequests, csiDriver.Spec.TokenRequests)
 			require.Equal(t, test.wantRequiresRepublish, csiDriver.Spec.RequiresRepublish)
-			require.Equal(t, test.wantSELinuxMount, csiDriver.Spec.SELinuxMounted)
+			require.Equal(t, test.wantSELinuxMount, csiDriver.Spec.SELinuxMount)
 		})
 	}
 }