deps: bump cri-dockerd to 0.2.3

Author: manusa

src/__tests__/download.test.js

@@ -108,7 +108,7 @@ describe('download module test suite', () => {
     });
   });
 
-  describe('installCriDockerd', () => {
+  describe('installCriDockerd with token', () => {
     let fs;
     let exec;
     beforeEach(() => {
@@ -117,12 +117,24 @@ describe('download module test suite', () => {
       axios.mockImplementationOnce(async () => ({
         data: {
           assets: [
+            {
+              name: 'cri-dockerd-0.2.3-3.el7.src.rpm',
+              browser_download_url: 'http://invalid'
+            },
+            {
+              name: 'cri-dockerd-0.2.3-3.el7.src.rpm',
+              browser_download_url: 'http://invalid'
+            },
             {
               name: 'cri-dockerd-v0.2.0-darwin-arm64.tar.gz',
               browser_download_url: 'http://invalid'
             },
             {
-              name: 'cri-dockerd-v0.2.0-linux-amd64.tar.gz',
+              name: 'cri-dockerd-0.2.3.arm64.tgz',
+              browser_download_url: 'http://invalid'
+            },
+            {
+              name: 'cri-dockerd-0.2.3.amd64.tgz',
               browser_download_url: 'http://valid'
             },
             {
@@ -132,30 +144,48 @@ describe('download module test suite', () => {
           ]
         }
       }));
+      tc.downloadTool.mockImplementationOnce(async () => 'cri-dockerd.tgz');
       fs.readdirSync = jest.fn(() => [
         {isDirectory: () => true, name: 'cri-dockerd'}
       ]);
       fs.readFileSync = jest.fn(() => '');
       fs.writeFileSync = jest.fn();
     });
-    test('with token, should download and install valid Linux version', async () => {
-      // Given
-      tc.downloadTool.mockImplementationOnce(async () => 'cri-dockerd.tar.gz');
+    test('should download Linux version', async () => {
       // When
       await download.installCriDockerd({githubToken: 'secret-token'});
       // Then
       expect(axios).toHaveBeenCalledWith(
         expect.objectContaining({
-          url: 'https://api.github.com/repos/Mirantis/cri-dockerd/releases/tags/v0.2.0',
+          url: 'https://api.github.com/repos/Mirantis/cri-dockerd/releases/tags/v0.2.3',
           headers: {Authorization: 'token secret-token'}
         })
       );
       expect(tc.downloadTool).toHaveBeenCalledWith('http://valid');
-      expect(tc.extractTar).toHaveBeenCalledWith(
-        'cri-dockerd.tar.gz',
-        '/usr/local/bin'
+    });
+    test('should install cri-dockerd binary', async () => {
+      // When
+      await download.installCriDockerd({githubToken: 'secret-token'});
+      // Then
+      expect(tc.extractTar).toHaveBeenCalledWith('cri-dockerd.tgz');
+      expect(exec.logExecSync).toHaveBeenCalledWith(
+        expect.stringMatching(
+          /sudo cp -a .+\/cri-dockerd\/cri-dockerd \/usr\/local\/bin\//
+        )
+      );
+      expect(exec.logExecSync).toHaveBeenCalledWith(
+        'sudo ln -s /usr/local/bin/cri-dockerd /usr/bin/cri-dockerd'
+      );
+    });
+    test('should install cri-dockerd service', async () => {
+      // When
+      await download.installCriDockerd({githubToken: 'secret-token'});
+      // Then
+      expect(exec.logExecSync).toHaveBeenCalledWith(
+        expect.stringMatching(
+          /sed -i 's\/cri-dockerd --\/cri-dockerd --network-plugin=cni --\/g'/
+        )
       );
-      expect(exec.logExecSync).toHaveBeenCalledTimes(4);
       expect(exec.logExecSync).toHaveBeenCalledWith(
         expect.stringMatching(
           /sudo cp -a .+\/packaging\/systemd\/\* \/etc\/systemd\/system/

src/download.js

@@ -9,6 +9,11 @@ const {logExecSync} = require('./exec');
 const isLinux = name => name.indexOf('linux') >= 0;
 const isAmd64 = name => name.indexOf('amd64') >= 0;
 const isSignature = name => name.indexOf('sha256') >= 0;
+const isWindows = name => name.indexOf('.win.') >= 0;
+const isMac = name => name.indexOf('.darwin.') >= 0;
+const isTgz = name => name.endsWith('.tgz');
+const firstDir = dir => fs.readdirSync(dir, {withFileTypes: true}).filter(f => f.isDirectory()).map(f => f.name)[0];
+
 
 const getTagInfo = async ({inputs, releaseUrl}) => {
   const headers = {};
@@ -55,18 +60,25 @@ const installCriDockerd = async (inputs = {}) => {
   // const tagInfo = await getTagInfo({inputs, releaseUrl});
   // const tag = tagInfo.data.name;
   // const releaseUrl = 'https://api.github.com/repos/Mirantis/cri-dockerd/releases/latest';
-  const tag = 'v0.2.0';
+  const tag = 'v0.2.3';
   const releaseUrl = `https://api.github.com/repos/Mirantis/cri-dockerd/releases/tags/${tag}`;
   const binaryTar = await downloadGitHubArtifact({
     inputs,
     releaseUrl,
     assetPredicate: asset =>
-      isLinux(asset.name) && isAmd64(asset.name) && !isSignature(asset.name) && asset.name.indexOf('cri-dockerd') === 0
+      !isSignature(asset.name) && !isWindows(asset.name) && !isMac(asset.name) && isAmd64(asset.name) && isTgz(asset.name) && asset.name.indexOf('cri-dockerd') === 0
   });
-  await tc.extractTar(binaryTar, '/usr/local/bin');
+  // Binary
+  const binaryDir = await tc.extractTar(binaryTar);
+  const binaryContent = firstDir(binaryDir);
+  logExecSync(`sudo cp -a ${binaryDir}/${binaryContent}/cri-dockerd /usr/local/bin/`);
+  logExecSync(`sudo ln -s /usr/local/bin/cri-dockerd /usr/bin/cri-dockerd`);
+  // Service file
   const sourceTar = await tc.downloadTool(`https://github.com/Mirantis/cri-dockerd/archive/refs/tags/${tag}.tar.gz`);
   const sourceDir = await tc.extractTar(sourceTar);
-  const sourceContent = fs.readdirSync(sourceDir, {withFileTypes: true}).filter(f => f.isDirectory()).map(f => f.name)[0];
+  const sourceContent = firstDir(sourceDir);
+  logExecSync(`sed -i 's/cri-dockerd --/cri-dockerd --network-plugin=cni --/g' ${sourceDir}/${sourceContent}/packaging/systemd/cri-docker.service`);
+  logExecSync(`cat ${sourceDir}/${sourceContent}/packaging/systemd/cri-docker.service`);
   logExecSync(`sudo cp -a ${sourceDir}/${sourceContent}/packaging/systemd/* /etc/systemd/system`);
   const serviceFile = '/etc/systemd/system/cri-docker.service';
   fs.writeFileSync(serviceFile, fs.readFileSync(serviceFile).toString()