Merge pull request #170 from doitintl/admissionregistration-v1beta1

feat: Cover deprecated `admissionregistration.k8s.io/v1beta1` API group
doitintl · Jun 16, 2021 · 9f5888f · 9f5888f
2 parents 6ac1b3e + 1868e16
commit 9f5888f
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 0 deletions.
diff --git a/fixtures/mutatingwebhookconfiguration-v1beta1.yaml b/fixtures/mutatingwebhookconfiguration-v1beta1.yaml
@@ -0,0 +1,17 @@
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: test
+  namespace: my-namespace
+webhooks:
+  - name: test.example.com
+    clientConfig:
+      service:
+        name: webhook
+        namespace: test
+        path: "/"
+    rules:
+      - operations: [ "CREATE" ]
+        apiGroups: [""]
+        apiVersions: ["v1"]
+        resources: ["pods"]
diff --git a/fixtures/validatingwebhookconfiguration-v1beta1.yaml b/fixtures/validatingwebhookconfiguration-v1beta1.yaml
@@ -0,0 +1,17 @@
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: test
+  namespace: my-namespace
+webhooks:
+  - name: test.example.com
+    clientConfig:
+      service:
+        name: webhook
+        namespace: test
+        path: "/"
+    rules:
+      - operations: [ "CREATE" ]
+        apiGroups: [""]
+        apiVersions: ["v1"]
+        resources: ["pods"]
diff --git a/pkg/collector/cluster.go b/pkg/collector/cluster.go
@@ -96,6 +96,8 @@ func (c *ClusterCollector) Get() ([]map[string]interface{}, error) {
 		schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"},
 		schema.GroupVersionResource{Group: "apiregistration.k8s.io", Version: "v1", Resource: "apiservices"},
 		schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1", Resource: "customresourcedefinitions"},
+		schema.GroupVersionResource{Group: "admissionregistration.k8s.io", Version: "v1", Resource: "mutatingwebhookconfigurations"},
+		schema.GroupVersionResource{Group: "admissionregistration.k8s.io", Version: "v1", Resource: "validatingwebhookconfigurations"},
 	}
 	gvrs = append(gvrs, c.additionalResources...)
 

diff --git a/pkg/rules/rego/deprecated-1-22.rego b/pkg/rules/rego/deprecated-1-22.rego
@@ -116,6 +116,16 @@ deprecated_api(kind, api_version) = api {
 			"new": "apiextensions.k8s.io/v1",
 			"since": "1.16",
 		},
+		"MutatingWebhookConfiguration": {
+			"old": ["admissionregistration.k8s.io/v1beta1"],
+			"new": "admissionregistration.k8s.io/v1",
+			"since": "1.16",
+		},
+		"ValidatingWebhookConfiguration": {
+			"old": ["admissionregistration.k8s.io/v1beta1"],
+			"new": "admissionregistration.k8s.io/v1",
+			"since": "1.16",
+		},
 	}
 
 	deprecated_apis[kind].old[_] == api_version

diff --git a/test/rules_122_test.go b/test/rules_122_test.go
@@ -31,6 +31,8 @@ func TestRego122(t *testing.T) {
 		{"TokenReview", []string{"../fixtures/tokenreview-v1beta1.yaml"}, []string{"TokenReview"}},
 		{"APIService", []string{"../fixtures/apiservice-v1beta1.yaml"}, []string{"APIService"}},
 		{"CustomResourceDefinition", []string{"../fixtures/customresourcedefinition-v1beta1.yaml"}, []string{"CustomResourceDefinition"}},
+		{"MutatingWebhookConfiguration", []string{"../fixtures/mutatingwebhookconfiguration-v1beta1.yaml"}, []string{"MutatingWebhookConfiguration"}},
+		{"ValidatingWebhookConfiguration", []string{"../fixtures/validatingwebhookconfiguration-v1beta1.yaml"}, []string{"ValidatingWebhookConfiguration"}},
 	}
 
 	for _, tc := range testCases {