Custom match criteria (#116350)

* Add custom match conditions for CEL admission This PR is based off of, and dependent on the following PR: kubernetes/kubernetes#116261 Signed-off-by: Max Smythe <[email protected]> * run `make update` Signed-off-by: Max Smythe <[email protected]> * Fix unit tests Signed-off-by: Max Smythe <[email protected]> * Fix unit tests Signed-off-by: Max Smythe <[email protected]> * Update compatibility test data Signed-off-by: Max Smythe <[email protected]> * Revert "Update compatibility test data" This reverts commit 312ba7f9e74e0ec4a7ac1f07bf575479c608af28. * Allow params during validation; make match conditions optional Signed-off-by: Max Smythe <[email protected]> * Add conditional ignoring of matcher CEL expression validation on update Signed-off-by: Max Smythe <[email protected]> * Run codegen Signed-off-by: Max Smythe <[email protected]> * Add more validation tests Signed-off-by: Max Smythe <[email protected]> * Short-circuit CEL matcher when no matchers specified Signed-off-by: Max Smythe <[email protected]> * Run codegen Signed-off-by: Max Smythe <[email protected]> * Address review comments Signed-off-by: Max Smythe <[email protected]> --------- Signed-off-by: Max Smythe <[email protected]> Kubernetes-commit: e5fd204c33e90a7e8f5a0ee70242f1296a5ec7af
kubernetes · Mar 16, 2023 · 4666344 · 4666344
1 parent 3858973
commit 4666344
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 4 deletions.
diff --git a/applyconfigurations/admissionregistration/v1alpha1/matchcondition.go b/applyconfigurations/admissionregistration/v1alpha1/matchcondition.go
diff --git a/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicyspec.go b/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicyspec.go
diff --git a/applyconfigurations/internal/internal.go b/applyconfigurations/internal/internal.go
diff --git a/applyconfigurations/utils.go b/applyconfigurations/utils.go
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	golang.org/x/term v0.6.0
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
 	google.golang.org/protobuf v1.28.1
-	k8s.io/api v0.0.0-20230315032826-0b4c449988b1
+	k8s.io/api v0.0.0-20230316002315-c80582ebe125
 	k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
 	k8s.io/klog/v2 v2.90.1
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
@@ -59,6 +59,6 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20230315032826-0b4c449988b1
+	k8s.io/api => k8s.io/api v0.0.0-20230316002315-c80582ebe125
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
 )
diff --git a/go.sum b/go.sum
@@ -477,8 +477,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20230315032826-0b4c449988b1 h1:wlCdY1kqV0RkfnfRr4mEZ3fGJ1VvLelr5Q2vCnCICIo=
-k8s.io/api v0.0.0-20230315032826-0b4c449988b1/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4=
+k8s.io/api v0.0.0-20230316002315-c80582ebe125 h1:sNLUUpJNxIYmttU1YQIm4nhSD2jK3wOkSQVsqhlFh2A=
+k8s.io/api v0.0.0-20230316002315-c80582ebe125/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4=
 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=