Merge pull request #250 from karelyatin/OSPRH-4553

Fix preStop Hooks for ovn-controller pod containers

pkg/ovncontroller/daemonset.go

@@ -108,9 +108,8 @@ func DaemonSet(
 	ovsDbArgs = []string{
 		"--single-child", "--", "/usr/local/bin/container-scripts/start-ovsdb-server.sh",
 	}
-	// sleep is required as workaround for https://github.com/kubernetes/kubernetes/issues/39170
 	ovsDbPreStopCmd = []string{
-		"/usr/share/openvswitch/scripts/ovs-ctl", "stop", "--no-ovs-vswitchd", ";", "sleep", "2",
+		"/usr/share/openvswitch/scripts/ovs-ctl", "stop", "--no-ovs-vswitchd",
 	}
 
 	ovsVswitchdLivenessProbe.Exec = &corev1.ExecAction{
@@ -125,9 +124,8 @@ func DaemonSet(
 	ovsVswitchdArgs = []string{
 		"--pidfile", "--mlockall",
 	}
-	// sleep is required as workaround for https://github.com/kubernetes/kubernetes/issues/39170
 	ovsVswitchdPreStopCmd = []string{
-		"/usr/share/openvswitch/scripts/ovs-ctl", "stop", "--no-ovsdb-server", ";", "sleep", "2",
+		"/usr/share/openvswitch/scripts/ovs-ctl", "stop", "--no-ovsdb-server",
 	}
 
 	ovnControllerCmd = []string{
@@ -142,9 +140,8 @@ func DaemonSet(
 			" ",
 		),
 	}
-	// sleep is required as workaround for https://github.com/kubernetes/kubernetes/issues/39170
 	ovnControllerPreStopCmd = []string{
-		"/usr/share/ovn/scripts/ovn-ctl", "stop_controller", ";", "sleep", "2",
+		"/usr/share/ovn/scripts/ovn-ctl", "stop_controller",
 	}
 
 	envVars := map[string]env.Setter{}

tests/kuttl/common/assert_sample_deployment.yaml

@@ -330,3 +330,15 @@ commands:
         done
 
         exit 0
+---
+# check that the chassis is registered in sb db
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+commands:
+    - script: |
+        controller_pod=$(oc get pod -n $NAMESPACE -l service=ovn-controller -o name|head -1)
+        host=$(oc rsh -n $NAMESPACE ${controller_pod} ovs-vsctl get open . external_ids:hostname)
+
+        sb_pod=$(oc get pod -n $NAMESPACE -l service=ovsdbserver-sb -o name|head -1)
+        oc rsh -n $NAMESPACE ${sb_pod} ovn-sbctl list chassis | grep -q ${host} || exit 1
+        exit 0

tests/kuttl/tests/ovn_config/03-assert.yaml

@@ -0,0 +1,13 @@
+#
+# Check for:
+#
+# - chassis unregistered in sb db
+
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 30
+commands:
+    - script: |
+        sb_pod=$(oc get pod -n $NAMESPACE -l service=ovsdbserver-sb -o name|head -1)
+        oc rsh -n $NAMESPACE ${sb_pod} ovn-sbctl list chassis | grep -q hostname && exit 1
+        exit 0

tests/kuttl/tests/ovn_config/03-remove-ovncontroller.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      oc patch OVNController -n $NAMESPACE ovncontroller-sample --type='json' -p='[{"op": "replace", "path": "/spec/nodeSelector", "value":{"node": "non-existing-node-name"}}]'