github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

refactor: move vap into parent policy folder

Browse Source 
also renames to remove stutter

comment
This commit is contained in:
Alexander Zielenski
2024-01-17 18:09:30 -08:00
parent 8b26b6eec1
commit 8b14116509
33 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go
View File

@@ -20,7 +20,7 @@ import (
"context" "context"
apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
pluginvalidatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" pluginvalidatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
"k8s.io/apiserver/pkg/cel/openapi/resolver" "k8s.io/apiserver/pkg/cel/openapi/resolver"
genericfeatures "k8s.io/apiserver/pkg/features" genericfeatures "k8s.io/apiserver/pkg/features"
k8sscheme "k8s.io/client-go/kubernetes/scheme" k8sscheme "k8s.io/client-go/kubernetes/scheme"

2
pkg/apis/admissionregistration/validation/validation.go
View File

@@ -31,7 +31,7 @@ import (
utilvalidation "k8s.io/apimachinery/pkg/util/validation" utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
plugincel "k8s.io/apiserver/pkg/admission/plugin/cel" plugincel "k8s.io/apiserver/pkg/admission/plugin/cel"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
"k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions"
"k8s.io/apiserver/pkg/cel" "k8s.io/apiserver/pkg/cel"
"k8s.io/apiserver/pkg/cel/environment" "k8s.io/apiserver/pkg/cel/environment"

2
pkg/controller/validatingadmissionpolicystatus/controller.go
View File

@@ -26,7 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
admissionregistrationv1beta1apply "k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1" admissionregistrationv1beta1apply "k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1"
informerv1beta1 "k8s.io/client-go/informers/admissionregistration/v1beta1" informerv1beta1 "k8s.io/client-go/informers/admissionregistration/v1beta1"
admissionregistrationv1beta1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1" admissionregistrationv1beta1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1"

2
pkg/controller/validatingadmissionpolicystatus/controller_test.go
View File

@@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta/testrestmapper" "k8s.io/apimachinery/pkg/api/meta/testrestmapper"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
"k8s.io/apiserver/pkg/cel/openapi/resolver" "k8s.io/apiserver/pkg/cel/openapi/resolver"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"

2
pkg/kubeapiserver/options/plugins.go
View File

@@ -20,7 +20,7 @@ package options
// This should probably be part of some configuration fed into the build for a // This should probably be part of some configuration fed into the build for a
// given binary target. // given binary target.
import ( import (
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
// Admission policies // Admission policies
"k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/admit"
"k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages" "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages"

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/controller.go
View File

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/controller_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/controller_test.go
View File

@@ -39,7 +39,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic"
clienttesting "k8s.io/client-go/testing" clienttesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/doc.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/doc.go
View File

4
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/informer.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/informer.go
View File

@@ -28,6 +28,10 @@ type informer[T runtime.Object] struct {
lister[T] lister[T]
} }
// Creates a generic informer around a type-erased cache.SharedIndexInformer
// It is incumbent on the caller to ensure that the generic type argument is
// consistent with the type of the objects stored inside the SharedIndexInformer
// as they will be casted.
func NewInformer[T runtime.Object](informe cache.SharedIndexInformer) Informer[T] { func NewInformer[T runtime.Object](informe cache.SharedIndexInformer) Informer[T] {
return informer[T]{ return informer[T]{
SharedIndexInformer: informe, SharedIndexInformer: informe,

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/interface.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/interface.go
View File

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic/lister.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/lister.go
View File

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/OWNERS → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/OWNERS
View File

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/admission.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

4
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/admission_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/admission_test.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"
@@ -45,7 +45,7 @@ import (
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission/initializer" "k8s.io/apiserver/pkg/admission/initializer"
"k8s.io/apiserver/pkg/admission/plugin/cel" "k8s.io/apiserver/pkg/admission/plugin/cel"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic"
"k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions"
auditinternal "k8s.io/apiserver/pkg/apis/audit" auditinternal "k8s.io/apiserver/pkg/apis/audit"
"k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizer"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/caching_authorizer.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/caching_authorizer_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/caching_authorizer_test.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

8
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/controller.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"
@@ -37,9 +37,9 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching" celmetrics "k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics"
celmetrics "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics" "k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching"
celconfig "k8s.io/apiserver/pkg/apis/cel" celconfig "k8s.io/apiserver/pkg/apis/cel"
"k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/warning" "k8s.io/apiserver/pkg/warning"

6
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/controller_reconcile.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"
@@ -32,8 +32,8 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/admission/plugin/cel" "k8s.io/apiserver/pkg/admission/plugin/cel"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/internal/generic" "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic"
celmetrics "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics" celmetrics "k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics"
"k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions" "k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions"
"k8s.io/apiserver/pkg/cel/environment" "k8s.io/apiserver/pkg/cel/environment"
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/initializer.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/initializer.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/interface.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/interface.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

4
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matcher.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/matcher.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"k8s.io/api/admissionregistration/v1beta1" "k8s.io/api/admissionregistration/v1beta1"
@@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching" "k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching"
) )
var _ matching.MatchCriteria = &matchCriteria{} var _ matching.MatchCriteria = &matchCriteria{}

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/message.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/message.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
celgo "github.com/google/cel-go/cel" celgo "github.com/google/cel-go/cel"

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics.go
View File

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/metrics/metrics_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/metrics/metrics_test.go
View File

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/policy_decision.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/policy_decision.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"net/http" "net/http"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/typechecking.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"errors" "errors"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/typechecking_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/typechecking_test.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"fmt" "fmt"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/validator.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/validator_test.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package validatingadmissionpolicy package validating
import ( import (
"context" "context"

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching/matching.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching.go
View File

0
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/matching/matching_test.go → staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validatingadmissionpolicy/matching/matching_test.go
View File

2
staging/src/k8s.io/apiserver/pkg/server/options/admission.go
View File

@@ -29,7 +29,7 @@ import (
"k8s.io/apiserver/pkg/admission/initializer" "k8s.io/apiserver/pkg/admission/initializer"
admissionmetrics "k8s.io/apiserver/pkg/admission/metrics" admissionmetrics "k8s.io/apiserver/pkg/admission/metrics"
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating" mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating"
validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating" validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating"
apiserverapi "k8s.io/apiserver/pkg/apis/apiserver" apiserverapi "k8s.io/apiserver/pkg/apis/apiserver"

2
staging/src/k8s.io/apiserver/pkg/server/plugins.go
View File

@@ -20,7 +20,7 @@ package server
import ( import (
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
"k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating"
mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating" mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating"
validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating" validatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/validating"
) )