diff options
| -rw-r--r-- | test/security/k8s/src/check/cmd/check/check.go | 2 | ||||
| -rw-r--r-- | test/security/k8s/src/check/validators/master/api.go | 8 | ||||
| -rw-r--r-- | test/security/k8s/src/check/validators/master/api_test.go | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/test/security/k8s/src/check/cmd/check/check.go b/test/security/k8s/src/check/cmd/check/check.go index 64c47488c..a351199b0 100644 --- a/test/security/k8s/src/check/cmd/check/check.go +++ b/test/security/k8s/src/check/cmd/check/check.go @@ -61,4 +61,6 @@ func main() { log.Printf("IsServiceAccountAdmissionControlPluginIncluded: %t\n", master.IsServiceAccountAdmissionControlPluginIncluded(k8sParams)) log.Printf("IsNodeRestrictionAdmissionControlPluginIncluded: %t\n", master.IsNodeRestrictionAdmissionControlPluginIncluded(k8sParams)) log.Printf("IsEventRateLimitAdmissionControlPluginIncluded: %t\n", master.IsEventRateLimitAdmissionControlPluginIncluded(k8sParams)) + + log.Printf("IsNamespaceLifecycleAdmissionControlPluginNotExcluded: %t\n", master.IsNamespaceLifecycleAdmissionControlPluginNotExcluded(k8sParams)) } diff --git a/test/security/k8s/src/check/validators/master/api.go b/test/security/k8s/src/check/validators/master/api.go index 0bed71189..dc22e35f6 100644 --- a/test/security/k8s/src/check/validators/master/api.go +++ b/test/security/k8s/src/check/validators/master/api.go @@ -215,6 +215,14 @@ func IsEventRateLimitAdmissionControlPluginIncluded(params []string) bool { return false } +// IsNamespaceLifecycleAdmissionControlPluginNotExcluded validates NamespaceLifecycle is excluded from admission control plugins. +func IsNamespaceLifecycleAdmissionControlPluginNotExcluded(params []string) bool { + if isSingleFlagPresent("--disable-admission-plugins=", params) { + return !hasFlagArgumentIncluded("--disable-admission-plugins=", "NamespaceLifecycle", params) + } + return true +} + // isSingleFlagPresent checks presence of selected flag and whether it was used once. func isSingleFlagPresent(flag string, params []string) bool { found := filterFlags(params, flag) diff --git a/test/security/k8s/src/check/validators/master/api_test.go b/test/security/k8s/src/check/validators/master/api_test.go index 4e125663a..233662a63 100644 --- a/test/security/k8s/src/check/validators/master/api_test.go +++ b/test/security/k8s/src/check/validators/master/api_test.go @@ -305,5 +305,15 @@ var _ = Describe("Api", func() { Entry("Is not present on Dublin cluster", kubeApiServerDublin, false), Entry("Should be present on CIS-compliant cluster", kubeApiServerCISCompliant, true), ) + + DescribeTable("NamespaceLifecycle admission control plugin", + func(params []string, expected bool) { + Expect(IsNamespaceLifecycleAdmissionControlPluginNotExcluded(params)).To(Equal(expected)) + }, + Entry("Is explicitly disabled on insecure cluster", []string{"--disable-admission-plugins=Foo,Bar,NamespaceLifecycle,Baz,Quuz"}, false), + Entry("Should not be disabled on CIS-compliant cluster", kubeApiServerCISCompliant, true), + Entry("Should not be disabled on Casablanca cluster", kubeApiServerCasablanca, true), + Entry("Should not be disabled on Dublin cluster", kubeApiServerDublin, true), + ) }) }) |