Merge pull request #602 from ykulazhenkov/pr-split-systemd-service

[switchdev 4/x] split systemd service to two parts
k8snetworkplumbingwg · Feb 9, 2024 · 97e82b4 · 97e82b4
2 parents f8405cf + 7faea56
commit 97e82b4
Show file tree

Hide file tree

Showing 12 changed files with 852 additions and 182 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,6 +43,9 @@ jobs:
     - name: test pkg
       run: make test-pkg
 
+    - name: test cmd
+      run: make test-cmd
+
     - name: test controllers on opensfhit
       run: CLUSTER_TYPE=openshift make test-controllers
 
@@ -84,6 +87,9 @@ jobs:
     - name: test pkg
       run: make test-pkg
 
+    - name: test cmd
+      run: make test-cmd
+
     - name: test controllers on opensfhit
       run: CLUSTER_TYPE=openshift make test-controllers
 

diff --git a/bindata/manifests/sriov-config-service/kubernetes/sriov-config-post-network-service.yaml b/bindata/manifests/sriov-config-service/kubernetes/sriov-config-post-network-service.yaml
@@ -0,0 +1,15 @@
+contents: |
+  [Unit]
+  Description=Configures SRIOV NIC - post network configuration
+  After=systemd-networkd-wait-online.service NetworkManager-wait-online.service
+  Before=network-online.target
+
+  [Service]
+  Type=oneshot
+  ExecStart=/var/lib/sriov/sriov-network-config-daemon -v 2 --zap-log-level 2 service --phase post
+  StandardOutput=journal+console
+
+  [Install]
+  WantedBy=network-online.target
+enabled: true
+name: sriov-config-post-network.service
diff --git a/bindata/manifests/sriov-config-service/kubernetes/sriov-config-service.yaml b/bindata/manifests/sriov-config-service/kubernetes/sriov-config-service.yaml
@@ -1,14 +1,15 @@
 contents: |
   [Unit]
-  Description=Configures SRIOV NIC
-  After=network-pre.target
-  Before=NetworkManager.service kubelet.service
-  
+  Description=Configures SRIOV NIC - pre network configuration
+  DefaultDependencies=no
+  After=network-pre.target systemd-udev-settle.service systemd-sysusers.service systemd-sysctl.service
+  Before=network.target NetworkManager.service systemd-networkd.service ovs-vswitchd.service ovsdb-server.service
+
   [Service]
   Type=oneshot
-  ExecStart=/var/lib/sriov/sriov-network-config-daemon -v 2 service
+  ExecStart=/var/lib/sriov/sriov-network-config-daemon -v 2 --zap-log-level 2 service --phase pre
   StandardOutput=journal+console
-  
+
   [Install]
   WantedBy=multi-user.target
 enabled: true

diff --git a/bindata/manifests/sriov-config-service/openshift/sriov-config-service.yaml b/bindata/manifests/sriov-config-service/openshift/sriov-config-service.yaml
@@ -12,19 +12,36 @@ spec:
       units:
         - contents: |
             [Unit]
-            Description=Configures SRIOV NIC
             # Removal of this file signals firstboot completion
             ConditionPathExists=!/etc/ignition-machine-config-encapsulated.json
-            # This service is used to configure the SR-IOV VFs on NICs
-            After=network-pre.target
-            Before=NetworkManager.service kubelet.service
-            
+            Description=Configures SRIOV NIC - pre network configuration
+            DefaultDependencies=no
+            After=network-pre.target systemd-udev-settle.service systemd-sysusers.service systemd-sysctl.service
+            Before=network.target NetworkManager.service systemd-networkd.service ovs-vswitchd.service ovsdb-server.service
+
             [Service]
             Type=oneshot
-            ExecStart=/var/lib/sriov/sriov-network-config-daemon service -v {{ .LogLevel }}
+            ExecStart=/var/lib/sriov/sriov-network-config-daemon service -v {{ .LogLevel }} --zap-log-level {{ .LogLevel }} --phase pre
             StandardOutput=journal+console
-            
+
             [Install]
             WantedBy=multi-user.target
           enabled: true
           name: "sriov-config.service"
+        - contents: |
+            [Unit]
+            # Removal of this file signals firstboot completion
+            ConditionPathExists=!/etc/ignition-machine-config-encapsulated.json
+            Description=Configures SRIOV NIC - post network configuration
+            After=systemd-networkd-wait-online.service NetworkManager-wait-online.service
+            Before=network-online.target
+
+            [Service]
+            Type=oneshot
+            ExecStart=/var/lib/sriov/sriov-network-config-daemon service -v {{ .LogLevel }} --zap-log-level {{ .LogLevel }} --phase post
+            StandardOutput=journal+console
+
+            [Install]
+            WantedBy=network-online.target
+          enabled: true
+          name: "sriov-config-post-network.service"