@@ -112,7 +112,7 @@ func startDummyHTTPServer(handle http.HandlerFunc, listenAddr string) (cancelFn
112112 return func () { _ = srv .Shutdown (context .Background ()) }
113113}
114114
115- func createNodeDisruption (name string , namespace string , nodeSelectorLabel map [string ]string , ctx context.Context ) {
115+ func createNodeDisruption (name string , namespace string , nodeSelectorLabel map [string ]string , disruptionType string , ctx context.Context ) {
116116 overlappingDisruption := & nodedisruptionv1alpha1.NodeDisruption {
117117 TypeMeta : metav1.TypeMeta {
118118 APIVersion : "nodedisruption.criteo.com/v1alpha1" ,
@@ -124,6 +124,7 @@ func createNodeDisruption(name string, namespace string, nodeSelectorLabel map[s
124124 },
125125 Spec : nodedisruptionv1alpha1.NodeDisruptionSpec {
126126 NodeSelector : metav1.LabelSelector {MatchLabels : nodeSelectorLabel },
127+ Type : disruptionType ,
127128 },
128129 }
129130 Expect (k8sClient .Create (ctx , overlappingDisruption .DeepCopy ())).Should (Succeed ())
@@ -644,7 +645,7 @@ var _ = Describe("NodeDisruption controller", func() {
644645
645646 BeforeEach (func () {
646647 By ("configuring a first disruption" )
647- createNodeDisruption (firstDisruptionName , NDNamespace , nodeLabels1 , ctx )
648+ createNodeDisruption (firstDisruptionName , NDNamespace , nodeLabels1 , "" , ctx )
648649 })
649650 AfterEach (func () {
650651 clearAllNodeDisruptionResources ()
@@ -664,7 +665,7 @@ var _ = Describe("NodeDisruption controller", func() {
664665 })
665666
666667 By ("creating an overlapping disruption" )
667- createNodeDisruption (overlappingDisruptionName , NDNamespace , node2Label , ctx )
668+ createNodeDisruption (overlappingDisruptionName , NDNamespace , node2Label , "" , ctx )
668669 })
669670 It ("rejects the NodeDisruption" , func () {
670671 Eventually (func () nodedisruptionv1alpha1.NodeDisruptionState {
@@ -691,7 +692,7 @@ var _ = Describe("NodeDisruption controller", func() {
691692 })
692693
693694 By ("creating an overlapping disruption" )
694- createNodeDisruption (overlappingDisruptionName , NDNamespace , node2Label , ctx )
695+ createNodeDisruption (overlappingDisruptionName , NDNamespace , node2Label , "" , ctx )
695696 })
696697 It ("accepts the NodeDisruption" , func () {
697698 Eventually (func () nodedisruptionv1alpha1.NodeDisruptionState {
@@ -705,5 +706,112 @@ var _ = Describe("NodeDisruption controller", func() {
705706 })
706707 })
707708 })
709+
710+ Describe ("Reject typed disruptions feature" , Label ("Node disruption type" ), Ordered , func () {
711+ var (
712+ createdDisruption = & nodedisruptionv1alpha1.NodeDisruption {}
713+ disruptionName = "disruption-test"
714+ allowedDisruptionTypes = []string {"maintenance" , "decommission" , "tor-maintenance" }
715+ )
716+
717+ AfterEach (func () {
718+ clearAllNodeDisruptionResources ()
719+ cancelFn ()
720+ })
721+
722+ Context ("NodeDisruptionTypes is enabled" , func () {
723+ When ("the created disruption has an allowed type" , func () {
724+ BeforeEach (func () {
725+ By ("Configuring a disruption" )
726+ createNodeDisruption (disruptionName , NDNamespace , nodeLabels1 , "maintenance" , ctx )
727+
728+ By ("starting a reconciler with NodeDisruptionTypes enabled" )
729+ cancelFn = startReconcilerWithConfig (NodeDisruptionReconcilerConfig {
730+ RejectOverlappingDisruption : false ,
731+ RetryInterval : time .Second * 1 ,
732+ NodeDisruptionTypes : allowedDisruptionTypes ,
733+ })
734+ })
735+ It ("grants the NodeDisruption" , func () {
736+ Eventually (func () nodedisruptionv1alpha1.NodeDisruptionState {
737+ err := k8sClient .Get (ctx , types.NamespacedName {Name : disruptionName , Namespace : NDNamespace }, createdDisruption )
738+ if err != nil {
739+ panic ("should be able to get" )
740+ }
741+ return createdDisruption .Status .State
742+ }, timeout , interval ).Should (Equal (nodedisruptionv1alpha1 .Granted ))
743+ })
744+ })
745+ When ("the created disruption has not an allowed type" , func () {
746+ BeforeEach (func () {
747+ By ("Configuring a disruption" )
748+ createNodeDisruption (disruptionName , NDNamespace , nodeLabels1 , "toto" , ctx )
749+
750+ By ("starting a reconciler with NodeDisruptionTypes enabled" )
751+ cancelFn = startReconcilerWithConfig (NodeDisruptionReconcilerConfig {
752+ RejectOverlappingDisruption : false ,
753+ RetryInterval : time .Second * 1 ,
754+ NodeDisruptionTypes : allowedDisruptionTypes ,
755+ })
756+ })
757+ It ("rejects the NodeDisruption" , func () {
758+ Eventually (func () nodedisruptionv1alpha1.NodeDisruptionState {
759+ err := k8sClient .Get (ctx , types.NamespacedName {Name : disruptionName , Namespace : NDNamespace }, createdDisruption )
760+ if err != nil {
761+ panic ("should be able to get" )
762+ }
763+ return createdDisruption .Status .State
764+ }, timeout , interval ).Should (Equal (nodedisruptionv1alpha1 .Rejected ))
765+ })
766+ })
767+ })
768+
769+ Context ("NodeDisruptionTypes is disabled" , func () {
770+ When ("the created disruption has a type" , func () {
771+ BeforeEach (func () {
772+ By ("Configuring a disruption" )
773+ createNodeDisruption (disruptionName , NDNamespace , nodeLabels1 , "maintenance" , ctx )
774+
775+ By ("starting a reconciler with NodeDisruptionTypes enabled" )
776+ cancelFn = startReconcilerWithConfig (NodeDisruptionReconcilerConfig {
777+ RejectOverlappingDisruption : false ,
778+ RetryInterval : time .Second * 1 ,
779+ NodeDisruptionTypes : []string {},
780+ })
781+ })
782+ It ("grants the NodeDisruption" , func () {
783+ Eventually (func () nodedisruptionv1alpha1.NodeDisruptionState {
784+ err := k8sClient .Get (ctx , types.NamespacedName {Name : disruptionName , Namespace : NDNamespace }, createdDisruption )
785+ if err != nil {
786+ panic ("should be able to get" )
787+ }
788+ return createdDisruption .Status .State
789+ }, timeout , interval ).Should (Equal (nodedisruptionv1alpha1 .Granted ))
790+ })
791+ })
792+ When ("the created disruption has not a type" , func () {
793+ BeforeEach (func () {
794+ By ("Configuring a disruption" )
795+ createNodeDisruption (disruptionName , NDNamespace , nodeLabels1 , "" , ctx )
796+
797+ By ("starting a reconciler with NodeDisruptionTypes enabled" )
798+ cancelFn = startReconcilerWithConfig (NodeDisruptionReconcilerConfig {
799+ RejectOverlappingDisruption : false ,
800+ RetryInterval : time .Second * 1 ,
801+ NodeDisruptionTypes : []string {},
802+ })
803+ })
804+ It ("grants the NodeDisruption" , func () {
805+ Eventually (func () nodedisruptionv1alpha1.NodeDisruptionState {
806+ err := k8sClient .Get (ctx , types.NamespacedName {Name : disruptionName , Namespace : NDNamespace }, createdDisruption )
807+ if err != nil {
808+ panic ("should be able to get" )
809+ }
810+ return createdDisruption .Status .State
811+ }, timeout , interval ).Should (Equal (nodedisruptionv1alpha1 .Granted ))
812+ })
813+ })
814+ })
815+ })
708816 })
709817})
0 commit comments