setting nodestate annotation with 'sriovnetwork.openshift.io/use-external-drainer=true' in case exteranl drainer is enabled

The motivation is for external drainer verification, that SRIOV operator is set with external drainer
Signed-off-by: Ido Heyvi <[email protected]>

Author: heyvister1

controllers/drain_controller_test.go

@@ -129,6 +129,16 @@ var _ = Describe("Drain Controller", Ordered, func() {
 	})
 
 	Context("when there is only one node", func() {
+		It("should not drain node on drain require while use-external-drainer annotation is set",
+			func(ctx context.Context) {
+				node, nodeState := createNode(ctx, "node1", true)
+
+				simulateDaemonSetAnnotation(node, constants.DrainRequired)
+
+				expectNodeStateAnnotation(nodeState, constants.DrainIdle)
+				expectNodeIsSchedulable(node)
+
+			})
 
 		It("should drain single node on drain require", func(ctx context.Context) {
 			node, nodeState := createNode(ctx, "node1", false)
@@ -442,7 +452,7 @@ func createNode(ctx context.Context, nodeName string, useExternalDrainer bool) (
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      nodeName,
 			Namespace: vars.Namespace,
-			Labels: map[string]string{
+			Annotations: map[string]string{
 				constants.NodeStateDrainAnnotationCurrent: constants.DrainIdle,
 			},
 		},

deployment/sriov-network-operator-chart/templates/operator.yaml

@@ -86,8 +86,10 @@ spec:
               value: {{ .Values.operator.metricsExporter.certificates.secretName }}
             - name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
               value: {{ .Values.images.metricsExporterKubeRbacProxy }}
-            - name: USE_EXTERNAL_DRAINER
-              value: {{ .Values.operator.externalDrainer.enabled | quote }}
+            {{- if .Values.operator.externalDrainer.enabled }}
+              - name: USE_EXTERNAL_DRAINER
+                value: {{ .Values.operator.externalDrainer.enabled | quote }}
+            {{- end }}
             {{- if .Values.operator.metricsExporter.prometheusOperator.enabled }}
             - name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED
               value: {{ .Values.operator.metricsExporter.prometheusOperator.enabled | quote}}

main.go

@@ -208,7 +208,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err := setupDrainController(mgr, restConfig, platformsHelper, scheme); err != nil {
+	if err := setupDrainController(mgr, restConfig, platformsHelper, mgr.GetScheme()); err != nil {
 		setupLog.Error(err, "unable to setup drain controller")
 		os.Exit(1)
 	}
@@ -274,8 +274,7 @@ func main() {
 func setupDrainController(mgr ctrl.Manager, restConfig *rest.Config,
 	platformsHelper platforms.Interface, scheme *runtime.Scheme) error {
 	if vars.UseExternalDrainer {
-		setupLog.Info("internal drain controller is disabled, draining will be done externally by the maintenance operator")
-		return nil
+		setupLog.Info("'UseExternalDrainer' is set, draining will be done externally")
 	}
 
 	// we need a client that doesn't use the local cache for the objects