38384d5c13
When introducing the new "generic" volume type for generic ephemeral inline volumes, the storage policy for PodSecurityPolicy objects should have been extended so that this new type is valid only if the generic ephemeral volume feature is enabled or an existing object already has it. Adding the new type to the internal API was also missed.
70 lines
2.0 KiB
Go
70 lines
2.0 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package podsecuritypolicy
|
|
|
|
import (
|
|
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
|
"k8s.io/kubernetes/pkg/apis/policy"
|
|
"k8s.io/kubernetes/pkg/features"
|
|
)
|
|
|
|
// DropDisabledFields removes disabled fields from the pod security policy spec.
|
|
// This should be called from PrepareForCreate/PrepareForUpdate for all resources containing a pod security policy spec.
|
|
func DropDisabledFields(pspSpec, oldPSPSpec *policy.PodSecurityPolicySpec) {
|
|
if !utilfeature.DefaultFeatureGate.Enabled(features.ProcMountType) && !allowedProcMountTypesInUse(oldPSPSpec) {
|
|
pspSpec.AllowedProcMountTypes = nil
|
|
}
|
|
if !utilfeature.DefaultFeatureGate.Enabled(features.CSIInlineVolume) {
|
|
pspSpec.AllowedCSIDrivers = nil
|
|
}
|
|
var volumes []policy.FSType
|
|
for _, volume := range pspSpec.Volumes {
|
|
if volume != policy.Ephemeral ||
|
|
utilfeature.DefaultFeatureGate.Enabled(features.GenericEphemeralVolume) ||
|
|
volumeInUse(oldPSPSpec, volume) {
|
|
// Keep it.
|
|
volumes = append(volumes, volume)
|
|
}
|
|
}
|
|
pspSpec.Volumes = volumes
|
|
}
|
|
|
|
func allowedProcMountTypesInUse(oldPSPSpec *policy.PodSecurityPolicySpec) bool {
|
|
if oldPSPSpec == nil {
|
|
return false
|
|
}
|
|
|
|
if oldPSPSpec.AllowedProcMountTypes != nil {
|
|
return true
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
func volumeInUse(oldPSPSpec *policy.PodSecurityPolicySpec, volume policy.FSType) bool {
|
|
if oldPSPSpec == nil {
|
|
return false
|
|
}
|
|
for _, v := range oldPSPSpec.Volumes {
|
|
if v == volume {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|