++

Signed-off-by: Denis Romanenko <denis.romanenko@flant.com>
deckhouse · Oct 20, 2022 · 95c08f8 · 95c08f8
1 parent bd662a5
commit 95c08f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/modules/002-deckhouse/hooks/check_kernel_versions.go b/modules/002-deckhouse/hooks/check_kernel_versions.go
@@ -50,7 +50,6 @@ const (
 )
 
 var _ = sdk.RegisterFunc(&go_hook.HookConfig{
-	OnAfterHelm: &go_hook.OrderedConfig{Order: 5},
 	Kubernetes: []go_hook.KubernetesConfig{
 		{
 			Name:       "nodes",

diff --git a/modules/002-deckhouse/hooks/check_kernel_versions_test.go b/modules/002-deckhouse/hooks/check_kernel_versions_test.go
@@ -68,8 +68,7 @@ status:
 
 	Context("Cluster is empty", func() {
 		BeforeEach(func() {
-			f.KubeStateSet(``)
-			f.BindingContexts.Set(f.GenerateAfterHelmContext())
+			f.BindingContexts.Set(f.KubeStateSet(``))
 			f.RunHook()
 		})
 
@@ -82,8 +81,7 @@ status:
 	Context("Cilium module enabled, nodes with proper kernels", func() {
 		BeforeEach(func() {
 			f.ValuesSetFromYaml("global.enabledModules", []byte("[cni-cilium]"))
-			f.KubeStateSet(stateNode1 + stateNode3)
-			f.BindingContexts.Set(f.GenerateAfterHelmContext())
+			f.BindingContexts.Set(f.KubeStateSet(stateNode1 + stateNode3))
 			f.RunHook()
 		})
 
@@ -93,8 +91,7 @@ status:
 
 		Context("Cilium module enabled, added node with improper kernel", func() {
 			BeforeEach(func() {
-				f.KubeStateSet(stateNode1 + stateNode2 + stateNode3)
-				f.BindingContexts.Set(f.GenerateAfterHelmContext())
+				f.BindingContexts.Set(f.KubeStateSet(stateNode1 + stateNode2 + stateNode3))
 				f.RunHook()
 			})
 
@@ -115,8 +112,7 @@ status:
 	Context("Cilium and istio modules enabled, nodes with proper kernels", func() {
 		BeforeEach(func() {
 			f.ValuesSetFromYaml("global.enabledModules", []byte("[cni-cilium, istio]"))
-			f.KubeStateSet(stateNode3)
-			f.BindingContexts.Set(f.GenerateAfterHelmContext())
+			f.BindingContexts.Set(f.KubeStateSet(stateNode3))
 			f.RunHook()
 		})
 
@@ -127,8 +123,7 @@ status:
 
 		Context("Cilium and istio modules enabled, added node with improper kernel", func() {
 			BeforeEach(func() {
-				f.KubeStateSet(stateNode1 + stateNode2 + stateNode3)
-				f.BindingContexts.Set(f.GenerateAfterHelmContext())
+				f.BindingContexts.Set(f.KubeStateSet(stateNode1 + stateNode2 + stateNode3))
 				f.RunHook()
 			})