Change default operations

Signed-off-by: anushkamittal2001 <[email protected]>
nirmata · Oct 3, 2023 · 32cf58f · 32cf58f
1 parent 841b1d9
commit 32cf58f
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/pkg/controllers/webhook/controller.go b/pkg/controllers/webhook/controller.go
@@ -796,10 +796,9 @@ func computeOperationsForValidatingWebhookConf(rules []kyvernov1.Rule, operation
 		if !opFound {
 			operationStatusMap[webhookCreate] = true
 			operationStatusMap[webhookUpdate] = true
+			operationStatusMap[webhookConnect] = true
+			operationStatusMap[webhookDelete] = true
 
-			if r.HasGenerate() {
-				operationStatusMap[webhookDelete] = true
-			}
 		}
 	}
 	return operationStatusMap
@@ -836,6 +835,7 @@ func computeOperationsForMutatingWebhookConf(rules []kyvernov1.Rule, operationSt
 			operationStatusMap[webhookCreate] = true
 			operationStatusMap[webhookUpdate] = true
 		}
+		operationStatusMap[webhookDelete] = true
 	}
 	return operationStatusMap
 }

diff --git a/pkg/controllers/webhook/controller_test.go b/pkg/controllers/webhook/controller_test.go
@@ -2,6 +2,7 @@ package webhook
 
 import (
 	"reflect"
+	"sort"
 	"testing"
 
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
@@ -39,6 +40,13 @@ func TestGetMinimumOperations(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			result := getMinimumOperations(testCase.inputMap)
+			sort.Slice(result, func(i, j int) bool {
+				return result[i] < result[j]
+			})
+			sort.Slice(testCase.expectedResult, func(i, j int) bool {
+				return testCase.expectedResult[i] < testCase.expectedResult[j]
+			})
+
 			if !reflect.DeepEqual(result, testCase.expectedResult) {
 				t.Errorf("Expected %v, but got %v", testCase.expectedResult, result)
 			}
@@ -65,6 +73,7 @@ func TestComputeOperationsForMutatingWebhookConf(t *testing.T) {
 			},
 			expectedResult: map[string]bool{
 				"CREATE": true,
+				"DELETE": true,
 			},
 		},
 		{
@@ -82,6 +91,7 @@ func TestComputeOperationsForMutatingWebhookConf(t *testing.T) {
 			expectedResult: map[string]bool{
 				webhookCreate: true,
 				webhookUpdate: true,
+				webhookDelete: true,
 			},
 		},
 	}
@@ -138,8 +148,10 @@ func TestComputeOperationsForValidatingWebhookConf(t *testing.T) {
 				},
 			},
 			expectedResult: map[string]bool{
-				webhookCreate: true,
-				webhookUpdate: true,
+				webhookCreate:  true,
+				webhookUpdate:  true,
+				webhookConnect: true,
+				webhookDelete:  true,
 			},
 		},
 		{

diff --git a/test/conformance/kuttl/webhooks/all-scale/webhooks.yaml b/test/conformance/kuttl/webhooks/all-scale/webhooks.yaml
@@ -13,6 +13,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - CONNECT
+    - DELETE
     resources:
     - '*/scale'
     scope: '*'
diff --git a/test/conformance/kuttl/webhooks/double-wildcard/webhooks.yaml b/test/conformance/kuttl/webhooks/double-wildcard/webhooks.yaml
@@ -14,6 +14,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - CONNECT
+    - DELETE
     resources:
     - '*/*'
     scope: '*'
diff --git a/test/conformance/kuttl/webhooks/only-pod/webhooks.yaml b/test/conformance/kuttl/webhooks/only-pod/webhooks.yaml
@@ -13,6 +13,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - CONNECT
+    - DELETE
     resources:
     - pods
     - pods/ephemeralcontainers

diff --git a/test/conformance/kuttl/webhooks/pod-all-subresources/webhooks.yaml b/test/conformance/kuttl/webhooks/pod-all-subresources/webhooks.yaml
@@ -13,6 +13,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - CONNECT
+    - DELETE
     resources:
     - pods/attach
     - pods/binding

diff --git a/test/conformance/kuttl/webhooks/wildcard/webhooks.yaml b/test/conformance/kuttl/webhooks/wildcard/webhooks.yaml
@@ -14,6 +14,8 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - CONNECT
+    - DELETE
     resources:
     - '*'
     - pods/ephemeralcontainers