github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Update generation when SELinuxMount is changed

Browse Source
This commit is contained in:
Jan Safranek 2022-06-06 17:29:45 +02:00
parent 3efeeef346
commit 189f19a698
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/registry/storage/csidriver/strategy.go
View File

@ -86,15 +86,17 @@ func (csiDriverStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.
newCSIDriver.Spec.VolumeLifecycleModes = nil 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 && if oldCSIDriver.Spec.SELinuxMount == nil &&
!utilfeature.DefaultFeatureGate.Enabled(features.SELinuxMountReadWriteOncePod) { !utilfeature.DefaultFeatureGate.Enabled(features.SELinuxMountReadWriteOncePod) {
newCSIDriver.Spec.SELinuxMount = nil 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 { func (csiDriverStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList {

8
pkg/registry/storage/csidriver/strategy_test.go
View File

@ -287,6 +287,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
old: driverWithNothing, old: driverWithNothing,
update: driverWithSELinuxMountEnabled, update: driverWithSELinuxMountEnabled,
wantSELinuxMount: &enabled, wantSELinuxMount: &enabled,
wantGeneration: 1,
}, },
{ {
name: "SELinux mount support feature enabled, before: off, update: on", name: "SELinux mount support feature enabled, before: off, update: on",
@ -294,6 +295,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
old: driverWithSELinuxMountDisabled, old: driverWithSELinuxMountDisabled,
update: driverWithSELinuxMountEnabled, update: driverWithSELinuxMountEnabled,
wantSELinuxMount: &enabled, wantSELinuxMount: &enabled,
wantGeneration: 1,
}, },
{ {
name: "SELinux mount support feature enabled, before: on, update: off", name: "SELinux mount support feature enabled, before: on, update: off",
@ -301,6 +303,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
old: driverWithSELinuxMountEnabled, old: driverWithSELinuxMountEnabled,
update: driverWithSELinuxMountDisabled, update: driverWithSELinuxMountDisabled,
wantSELinuxMount: &disabled, wantSELinuxMount: &disabled,
wantGeneration: 1,
}, },
{ {
name: "SELinux mount support feature disabled, before: nil, update: on", name: "SELinux mount support feature disabled, before: nil, update: on",
@ -308,6 +311,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
old: driverWithNothing, old: driverWithNothing,
update: driverWithSELinuxMountEnabled, update: driverWithSELinuxMountEnabled,
wantSELinuxMount: nil, wantSELinuxMount: nil,
wantGeneration: 0,
}, },
{ {
name: "SELinux mount support feature disabled, before: off, update: on", name: "SELinux mount support feature disabled, before: off, update: on",
@ -315,6 +319,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
old: driverWithSELinuxMountDisabled, old: driverWithSELinuxMountDisabled,
update: driverWithSELinuxMountEnabled, update: driverWithSELinuxMountEnabled,
wantSELinuxMount: &enabled, wantSELinuxMount: &enabled,
wantGeneration: 1,
}, },
{ {
name: "SELinux mount support feature enabled, before: on, update: off", name: "SELinux mount support feature enabled, before: on, update: off",
@ -322,6 +327,7 @@ func TestCSIDriverPrepareForUpdate(t *testing.T) {
old: driverWithSELinuxMountEnabled, old: driverWithSELinuxMountEnabled,
update: driverWithSELinuxMountDisabled, update: driverWithSELinuxMountDisabled,
wantSELinuxMount: &disabled, 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.wantModes, csiDriver.Spec.VolumeLifecycleModes)
require.Equal(t, test.wantTokenRequests, csiDriver.Spec.TokenRequests) require.Equal(t, test.wantTokenRequests, csiDriver.Spec.TokenRequests)
require.Equal(t, test.wantRequiresRepublish, csiDriver.Spec.RequiresRepublish) require.Equal(t, test.wantRequiresRepublish, csiDriver.Spec.RequiresRepublish)
require.Equal(t, test.wantSELinuxMount, csiDriver.Spec.SELinuxMounted) require.Equal(t, test.wantSELinuxMount, csiDriver.Spec.SELinuxMount)
}) })
} }
} }