day1 cleanup after the action (#1055)

pull-kernel-module-image.service runs twice: once to pull all the images and reboot the node, and the second time it just checks that everyting has been pulled and exits. During the second time we want to remove the tar of the loaded and saved kernel module image, so that it won't interfere with the correct flow once the node is rebooted again
rh-ecosystem-edge · Mar 19, 2024 · 237f77c · 237f77c
1 parent fd5f70a
commit 237f77c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pkg/mcproducer/templates/pull-image.gotmpl b/pkg/mcproducer/templates/pull-image.gotmpl
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 if [ -e {{.LocalFilePath}} ]; then
-    echo "File {{.LocalFilePath}} found.Nothing to do"
+    echo "File {{.LocalFilePath}} found.Nothing to do, the file was handled, removing it"
+    rm -f {{.LocalFilePath}}
 else
     podman pull --authfile /var/lib/kubelet/config.json {{.WorkerImage}}
     if [ $? -eq 0 ]; then

diff --git a/pkg/mcproducer/testdata/machineconfig-test.yaml b/pkg/mcproducer/testdata/machineconfig-test.yaml
@@ -64,7 +64,7 @@ spec:
           user:
             name: "root"
           contents:
-            source: "data:text/plain;base64,IyEvYmluL2Jhc2gKCmlmIFsgLWUgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciBdOyB0aGVuCiAgICBlY2hvICJGaWxlIC92YXIvbGliL2ltYWdlX2ZpbGVfZGF5MS50YXIgZm91bmQuTm90aGluZyB0byBkbyIKZWxzZQogICAgcG9kbWFuIHB1bGwgLS1hdXRoZmlsZSAvdmFyL2xpYi9rdWJlbGV0L2NvbmZpZy5qc29uIHF1YXkuaW8vZWRnZS1pbmZyYXN0cnVjdHVyZS9rZXJuZWwtbW9kdWxlLW1hbmFnZW1lbnQtd29ya2VyOmxhdGVzdAogICAgaWYgWyAkPyAtZXEgMCBdOyB0aGVuCiAgICAgICAgZWNobyAiSW1hZ2UgcXVheS5pby9lZGdlLWluZnJhc3RydWN0dXJlL2tlcm5lbC1tb2R1bGUtbWFuYWdlbWVudC13b3JrZXI6bGF0ZXN0IGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBwdWxsZWQiCiAgICBlbHNlCiAgICAgICAgZWNobyAiRmFpbGVkIHRvIHB1bGwgaW1hZ2UgcXVheS5pby9lZGdlLWluZnJhc3RydWN0dXJlL2tlcm5lbC1tb2R1bGUtbWFuYWdlbWVudC13b3JrZXI6bGF0ZXN0IgogICAgICAgIGV4aXQgMQogICAgZmkKCiAgICBlY2hvICJGaWxlIC92YXIvbGliL2ltYWdlX2ZpbGVfZGF5MS50YXIgaXMgbm90IG9uIHRoZSBmaWxlc3lzdGVtLCBwdWxsaW5nIGltYWdlIHF1YXkuaW8vcHJvamVjdC9yZXBvOnNvbWUtdGFnMTIiCiAgICBwb2RtYW4gcHVsbCAtLWF1dGhmaWxlIC92YXIvbGliL2t1YmVsZXQvY29uZmlnLmpzb24gcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMgogICAgaWYgWyAkPyAtZXEgMCBdOyB0aGVuCiAgICAgICAgZWNobyAiSW1hZ2UgcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMiBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgcHVsbGVkIgogICAgZWxzZQogICAgICAgIGVjaG8gIkZhaWxlZCB0byBwdWxsIGltYWdlIHF1YXkuaW8vcHJvamVjdC9yZXBvOnNvbWUtdGFnMTIiCiAgICAgICAgZXhpdCAxCiAgICBmaQogICAgZWNobyAiU2F2aW5nIGltYWdlIHF1YXkuaW8vcHJvamVjdC9yZXBvOnNvbWUtdGFnMTIgaW50byBhIGZpbGUgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciIKICAgIHBvZG1hbiBzYXZlIC1vIC92YXIvbGliL2ltYWdlX2ZpbGVfZGF5MS50YXIgcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMgogICAgaWYgWyAkPyAtZXEgMCBdOyB0aGVuCiAgICAgICAgZWNobyAiSW1hZ2UgcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMiBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgc2F2ZSBvbiBmaWxlIC92YXIvbGliL2ltYWdlX2ZpbGVfZGF5MS50YXIsIHJlYm9vdGluZy4uLiIKICAgICAgICByZWJvb3QKICAgIGVsc2UKICAgICAgICBlY2hvICJGYWlsZWQgdG8gc2F2ZSBpbWFnZSBxdWF5LmlvL3Byb2plY3QvcmVwbzpzb21lLXRhZzEyIHRvIGZpbGUgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciIKICAgIGZpCmZpCg=="
+            source: "data:text/plain;base64,IyEvYmluL2Jhc2gKCmlmIFsgLWUgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciBdOyB0aGVuCiAgICBlY2hvICJGaWxlIC92YXIvbGliL2ltYWdlX2ZpbGVfZGF5MS50YXIgZm91bmQuTm90aGluZyB0byBkbywgdGhlIGZpbGUgd2FzIGhhbmRsZWQsIHJlbW92aW5nIGl0IgogICAgcm0gLWYgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhcgplbHNlCiAgICBwb2RtYW4gcHVsbCAtLWF1dGhmaWxlIC92YXIvbGliL2t1YmVsZXQvY29uZmlnLmpzb24gcXVheS5pby9lZGdlLWluZnJhc3RydWN0dXJlL2tlcm5lbC1tb2R1bGUtbWFuYWdlbWVudC13b3JrZXI6bGF0ZXN0CiAgICBpZiBbICQ/IC1lcSAwIF07IHRoZW4KICAgICAgICBlY2hvICJJbWFnZSBxdWF5LmlvL2VkZ2UtaW5mcmFzdHJ1Y3R1cmUva2VybmVsLW1vZHVsZS1tYW5hZ2VtZW50LXdvcmtlcjpsYXRlc3QgaGFzIGJlZW4gc3VjY2Vzc2Z1bGx5IHB1bGxlZCIKICAgIGVsc2UKICAgICAgICBlY2hvICJGYWlsZWQgdG8gcHVsbCBpbWFnZSBxdWF5LmlvL2VkZ2UtaW5mcmFzdHJ1Y3R1cmUva2VybmVsLW1vZHVsZS1tYW5hZ2VtZW50LXdvcmtlcjpsYXRlc3QiCiAgICAgICAgZXhpdCAxCiAgICBmaQoKICAgIGVjaG8gIkZpbGUgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciBpcyBub3Qgb24gdGhlIGZpbGVzeXN0ZW0sIHB1bGxpbmcgaW1hZ2UgcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMiIKICAgIHBvZG1hbiBwdWxsIC0tYXV0aGZpbGUgL3Zhci9saWIva3ViZWxldC9jb25maWcuanNvbiBxdWF5LmlvL3Byb2plY3QvcmVwbzpzb21lLXRhZzEyCiAgICBpZiBbICQ/IC1lcSAwIF07IHRoZW4KICAgICAgICBlY2hvICJJbWFnZSBxdWF5LmlvL3Byb2plY3QvcmVwbzpzb21lLXRhZzEyIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBwdWxsZWQiCiAgICBlbHNlCiAgICAgICAgZWNobyAiRmFpbGVkIHRvIHB1bGwgaW1hZ2UgcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMiIKICAgICAgICBleGl0IDEKICAgIGZpCiAgICBlY2hvICJTYXZpbmcgaW1hZ2UgcXVheS5pby9wcm9qZWN0L3JlcG86c29tZS10YWcxMiBpbnRvIGEgZmlsZSAvdmFyL2xpYi9pbWFnZV9maWxlX2RheTEudGFyIgogICAgcG9kbWFuIHNhdmUgLW8gL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciBxdWF5LmlvL3Byb2plY3QvcmVwbzpzb21lLXRhZzEyCiAgICBpZiBbICQ/IC1lcSAwIF07IHRoZW4KICAgICAgICBlY2hvICJJbWFnZSBxdWF5LmlvL3Byb2plY3QvcmVwbzpzb21lLXRhZzEyIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBzYXZlIG9uIGZpbGUgL3Zhci9saWIvaW1hZ2VfZmlsZV9kYXkxLnRhciwgcmVib290aW5nLi4uIgogICAgICAgIHJlYm9vdAogICAgZWxzZQogICAgICAgIGVjaG8gIkZhaWxlZCB0byBzYXZlIGltYWdlIHF1YXkuaW8vcHJvamVjdC9yZXBvOnNvbWUtdGFnMTIgdG8gZmlsZSAvdmFyL2xpYi9pbWFnZV9maWxlX2RheTEudGFyIgogICAgZmkKZmkK"
         - path: "/etc/kmm-worker-day1/config.yaml"
           mode: 420
           overwrite: true

diff --git a/pkg/mcproducer/testdata/pull-image-test.sh b/pkg/mcproducer/testdata/pull-image-test.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 if [ -e /var/lib/image_file_day1.tar ]; then
-    echo "File /var/lib/image_file_day1.tar found.Nothing to do"
+    echo "File /var/lib/image_file_day1.tar found.Nothing to do, the file was handled, removing it"
+    rm -f /var/lib/image_file_day1.tar
 else
     podman pull --authfile /var/lib/kubelet/config.json quay.io/edge-infrastructure/kernel-module-management-worker:latest
     if [ $? -eq 0 ]; then