Merge pull request #788 from SchSeba/daemon_redesign

Daemon redesign - using controller-runtime

Author: SchSeba

.github/workflows/test.yml

@@ -40,16 +40,19 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
-    - name: test pkg
-      run: make test-pkg
+    - name: test pkg on kubernetes
+      run: CLUSTER_TYPE=kubernetes make test-pkg
+
+    - name: test pkg on openshift
+      run: CLUSTER_TYPE=openshift make test-pkg
 
     - name: test cmd
       run: make test-cmd
 
     - name: test api
       run: make test-api
 
-    - name: test controllers on opensfhit
+    - name: test controllers on openshift
       run: CLUSTER_TYPE=openshift make test-controllers
 
     - name: test controllers on kubernetes

bindata/manifests/sriov-config-service/kubernetes/sriov-config-post-network-service.yaml

@@ -6,7 +6,7 @@ contents: |
 
   [Service]
   Type=oneshot
-  ExecStart=/var/lib/sriov/sriov-network-config-daemon -v 2 --zap-log-level 2 service --phase post
+  ExecStart=/var/lib/sriov/sriov-network-config-daemon service --phase post
   StandardOutput=journal+console
 
   [Install]

bindata/manifests/sriov-config-service/kubernetes/sriov-config-service.yaml

@@ -7,7 +7,7 @@ contents: |
 
   [Service]
   Type=oneshot
-  ExecStart=/var/lib/sriov/sriov-network-config-daemon -v 2 --zap-log-level 2 service --phase pre
+  ExecStart=/var/lib/sriov/sriov-network-config-daemon service --phase pre
   StandardOutput=journal+console
 
   [Install]

bindata/manifests/sriov-config-service/openshift/sriov-config-service.yaml

@@ -21,7 +21,7 @@ spec:
 
             [Service]
             Type=oneshot
-            ExecStart=/var/lib/sriov/sriov-network-config-daemon service -v {{ .LogLevel }} --zap-log-level {{ .LogLevel }} --phase pre
+            ExecStart=/var/lib/sriov/sriov-network-config-daemon service --phase pre
             StandardOutput=journal+console
 
             [Install]
@@ -38,7 +38,7 @@ spec:
 
             [Service]
             Type=oneshot
-            ExecStart=/var/lib/sriov/sriov-network-config-daemon service -v {{ .LogLevel }} --zap-log-level {{ .LogLevel }} --phase post
+            ExecStart=/var/lib/sriov/sriov-network-config-daemon service --phase post
             StandardOutput=journal+console
 
             [Install]

cmd/sriov-network-config-daemon/service.go

@@ -85,6 +85,7 @@ func runServiceCmd(cmd *cobra.Command, args []string) error {
 	}
 	// init logger
 	snolog.InitLog()
+	snolog.SetLogLevel(2)
 	setupLog := log.Log.WithName("sriov-config-service").WithValues("phase", phaseArg)
 
 	setupLog.V(0).Info("Starting sriov-config-service", "version", version.Version)
@@ -168,7 +169,7 @@ func phasePre(setupLog logr.Logger, conf *systemd.SriovConfig, hostHelpers helpe
 
 func phasePost(setupLog logr.Logger, conf *systemd.SriovConfig, hostHelpers helper.HostHelpersInterface) error {
 	setupLog.V(0).Info("check result of the Pre phase")
-	prePhaseResult, err := systemd.ReadSriovResult()
+	prePhaseResult, _, err := systemd.ReadSriovResult()
 	if err != nil {
 		return fmt.Errorf("failed to read result of the pre phase: %v", err)
 	}