mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
remove psp api utils
This commit is contained in:
parent
e0bc0693e9
commit
99d402e58f
@ -1,8 +0,0 @@
|
|||||||
# See the OWNERS docs at https://go.k8s.io/owners
|
|
||||||
|
|
||||||
# approval on api packages bubbles to api-approvers
|
|
||||||
reviewers:
|
|
||||||
- sig-auth-policy-approvers
|
|
||||||
- sig-auth-policy-reviewers
|
|
||||||
labels:
|
|
||||||
- sig/auth
|
|
@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func allowedProcMountTypesInUse(oldPSPSpec *policy.PodSecurityPolicySpec) bool {
|
|
||||||
if oldPSPSpec == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
if oldPSPSpec.AllowedProcMountTypes != nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
|
|
||||||
}
|
|
@ -1,110 +0,0 @@
|
|||||||
/*
|
|
||||||
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 (
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/google/go-cmp/cmp"
|
|
||||||
|
|
||||||
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
|
||||||
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
|
||||||
api "k8s.io/kubernetes/pkg/apis/core"
|
|
||||||
"k8s.io/kubernetes/pkg/apis/policy"
|
|
||||||
"k8s.io/kubernetes/pkg/features"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestDropAllowedProcMountTypes(t *testing.T) {
|
|
||||||
allowedProcMountTypes := []api.ProcMountType{api.UnmaskedProcMount}
|
|
||||||
scWithoutAllowedProcMountTypes := func() *policy.PodSecurityPolicySpec {
|
|
||||||
return &policy.PodSecurityPolicySpec{}
|
|
||||||
}
|
|
||||||
scWithAllowedProcMountTypes := func() *policy.PodSecurityPolicySpec {
|
|
||||||
return &policy.PodSecurityPolicySpec{
|
|
||||||
AllowedProcMountTypes: allowedProcMountTypes,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
scInfo := []struct {
|
|
||||||
description string
|
|
||||||
hasAllowedProcMountTypes bool
|
|
||||||
sc func() *policy.PodSecurityPolicySpec
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
description: "PodSecurityPolicySpec Without AllowedProcMountTypes",
|
|
||||||
hasAllowedProcMountTypes: false,
|
|
||||||
sc: scWithoutAllowedProcMountTypes,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
description: "PodSecurityPolicySpec With AllowedProcMountTypes",
|
|
||||||
hasAllowedProcMountTypes: true,
|
|
||||||
sc: scWithAllowedProcMountTypes,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
description: "is nil",
|
|
||||||
hasAllowedProcMountTypes: false,
|
|
||||||
sc: func() *policy.PodSecurityPolicySpec { return nil },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, enabled := range []bool{true, false} {
|
|
||||||
for _, oldPSPSpecInfo := range scInfo {
|
|
||||||
for _, newPSPSpecInfo := range scInfo {
|
|
||||||
oldPSPSpecHasAllowedProcMountTypes, oldPSPSpec := oldPSPSpecInfo.hasAllowedProcMountTypes, oldPSPSpecInfo.sc()
|
|
||||||
newPSPSpecHasAllowedProcMountTypes, newPSPSpec := newPSPSpecInfo.hasAllowedProcMountTypes, newPSPSpecInfo.sc()
|
|
||||||
if newPSPSpec == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Run(fmt.Sprintf("feature enabled=%v, old PodSecurityPolicySpec %v, new PodSecurityPolicySpec %v", enabled, oldPSPSpecInfo.description, newPSPSpecInfo.description), func(t *testing.T) {
|
|
||||||
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ProcMountType, enabled)()
|
|
||||||
|
|
||||||
DropDisabledFields(newPSPSpec, oldPSPSpec)
|
|
||||||
|
|
||||||
// old PodSecurityPolicySpec should never be changed
|
|
||||||
if !reflect.DeepEqual(oldPSPSpec, oldPSPSpecInfo.sc()) {
|
|
||||||
t.Errorf("old PodSecurityPolicySpec changed: %v", cmp.Diff(oldPSPSpec, oldPSPSpecInfo.sc()))
|
|
||||||
}
|
|
||||||
|
|
||||||
switch {
|
|
||||||
case enabled || oldPSPSpecHasAllowedProcMountTypes:
|
|
||||||
// new PodSecurityPolicySpec should not be changed if the feature is enabled, or if the old PodSecurityPolicySpec had AllowedProcMountTypes
|
|
||||||
if !reflect.DeepEqual(newPSPSpec, newPSPSpecInfo.sc()) {
|
|
||||||
t.Errorf("new PodSecurityPolicySpec changed: %v", cmp.Diff(newPSPSpec, newPSPSpecInfo.sc()))
|
|
||||||
}
|
|
||||||
case newPSPSpecHasAllowedProcMountTypes:
|
|
||||||
// new PodSecurityPolicySpec should be changed
|
|
||||||
if reflect.DeepEqual(newPSPSpec, newPSPSpecInfo.sc()) {
|
|
||||||
t.Errorf("new PodSecurityPolicySpec was not changed")
|
|
||||||
}
|
|
||||||
// new PodSecurityPolicySpec should not have AllowedProcMountTypes
|
|
||||||
if !reflect.DeepEqual(newPSPSpec, scWithoutAllowedProcMountTypes()) {
|
|
||||||
t.Errorf("new PodSecurityPolicySpec had PodSecurityPolicySpecAllowedProcMountTypes: %v", cmp.Diff(newPSPSpec, scWithoutAllowedProcMountTypes()))
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
// new PodSecurityPolicySpec should not need to be changed
|
|
||||||
if !reflect.DeepEqual(newPSPSpec, newPSPSpecInfo.sc()) {
|
|
||||||
t.Errorf("new PodSecurityPolicySpec changed: %v", cmp.Diff(newPSPSpec, newPSPSpecInfo.sc()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user