feat: Kubernetes 1.26 support

Author: manusa

.github/workflows/runner.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        kubernetes: [v1.25.4,v1.24.4,v1.23.14,v1.22.12]
+        kubernetes: [v1.26.8,v1.25.13,v1.24.17,v1.23.17]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -42,7 +42,7 @@ jobs:
         uses: ./
         with:
           minikube version: v1.28.0
-          kubernetes version: v1.25.4
+          kubernetes version: v1.26.8
           github token: ${{ secrets.GITHUB_TOKEN }}
           driver: docker
       - name: Validate Minikube
@@ -65,7 +65,7 @@ jobs:
         uses: ./
         with:
           minikube version: v1.28.0
-          kubernetes version: v1.25.4
+          kubernetes version: v1.26.8
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--addons=registry --addons=metrics-server'
       - name: Validate Minikube
@@ -86,7 +86,7 @@ jobs:
         uses: ./
         with:
           minikube version: v1.28.0
-          kubernetes version: v1.25.4
+          kubernetes version: v1.26.8
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--addons=ingress'
       - name: Validate Minikube
@@ -100,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        kubernetes: [v1.25.4,1.24.8,v1.19.16]
+        kubernetes: [v1.26.8,v1.25.4,v1.19.16]
         container_runtime: ['containerd']
     steps:
       - name: Checkout
@@ -126,7 +126,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        kubernetes: [v1.22.15,v1.21.14,v1.20.15,v1.19.16,v1.18.20,v1.17.17]
+        kubernetes: [v1.22.17,v1.21.14,v1.20.15,v1.19.16,v1.18.20,v1.17.17]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

README.md

@@ -32,7 +32,7 @@ jobs:
         uses: manusa/[email protected]
         with:
           minikube version: 'v1.28.0'
-          kubernetes version: 'v1.25.4'
+          kubernetes version: 'v1.26.8'
           github token: ${{ secrets.GITHUB_TOKEN }}
       - name: Interact with the cluster
         run: kubectl get nodes

src/__tests__/configure-environment.test.js

@@ -1,27 +1,77 @@
 describe('configure-docker module test suite', () => {
+  let download;
   let configureEnvironment;
   let logExecSync;
   beforeEach(() => {
     jest.resetModules();
     jest.mock('../exec');
     jest.mock('../download');
+    download = require('../download');
     configureEnvironment = require('../configure-environment');
     logExecSync = require('../exec').logExecSync;
   });
-  test('configureEnvironment, should run all configuration commands', () => {
-    // Given
-    logExecSync.mockImplementation(() => {});
-    // When
-    configureEnvironment();
-    // Then
-    expect(logExecSync).toHaveBeenCalledTimes(2);
-  });
-  test('configureEnvironment with docker driver, should run all configuration commands', () => {
-    // Given
-    logExecSync.mockImplementation(() => {});
-    // When
-    configureEnvironment({driver: 'docker'});
-    // Then
-    expect(logExecSync).toHaveBeenCalledTimes(3);
+  describe('configureEnvironment', () => {
+    beforeEach(() => {
+      logExecSync.mockImplementation(() => {});
+    });
+    describe('with driver=docker', () => {
+      beforeEach(() => {
+        configureEnvironment({driver: 'docker'});
+      });
+      test('installs conntrack', () => {
+        expect(logExecSync).toHaveBeenCalledWith('sudo apt update -y');
+        expect(logExecSync).toHaveBeenCalledWith(
+          'sudo apt-get install -y conntrack'
+        );
+      });
+      test('waits for docker to be ready', () => {
+        expect(logExecSync).toHaveBeenCalledWith(
+          "docker version -f '{{.Server.Version}} - {{.Client.Version}}'"
+        );
+      });
+      test('doesn\t install cni plugins', () => {
+        expect(download.installCniPlugins).not.toHaveBeenCalled();
+      });
+    });
+    describe('with driver=undefined', () => {
+      beforeEach(() => {
+        configureEnvironment();
+      });
+      test('installs conntrack', () => {
+        expect(logExecSync).toHaveBeenCalledWith('sudo apt update -y');
+        expect(logExecSync).toHaveBeenCalledWith(
+          'sudo apt-get install -y conntrack'
+        );
+      });
+      test('installs cni plugins', () => {
+        expect(download.installCniPlugins).toHaveBeenCalledTimes(1);
+      });
+      test('installs crictl', () => {
+        expect(download.installCriCtl).toHaveBeenCalledTimes(1);
+      });
+      test('installs cri-dockerd', () => {
+        expect(download.installCriDockerd).toHaveBeenCalledTimes(1);
+      });
+    });
+    describe('with driver=none', () => {
+      beforeEach(() => {
+        configureEnvironment({driver: 'none'});
+      });
+      test('installs conntrack', () => {
+        expect(logExecSync).toHaveBeenCalledWith('sudo apt update -y');
+        expect(logExecSync).toHaveBeenCalledWith(
+          'sudo apt-get install -y conntrack'
+        );
+      });
+      test('installs cni plugins', () => {
+        expect(download.installCniPlugins).toHaveBeenCalledTimes(1);
+      });
+      test('installs crictl', () => {
+        expect(download.installCriCtl).toHaveBeenCalledTimes(1);
+      });
+      test('installs cri-dockerd', () => {
+        expect(download.installCriDockerd).toHaveBeenCalledTimes(1);
+      });
+    });
   });
 });

src/configure-environment.js

@@ -22,16 +22,19 @@ const waitForDocker = async (attempt = 0) => {
 };
 
 const configureEnvironment = async (inputs = {}) => {
+  const {driver = 'none'} = inputs;
   core.info('Updating Environment configuration to support Minikube');
   logExecSync('sudo apt update -y');
   logExecSync('sudo apt-get install -y conntrack');
-  if (inputs.driver === 'docker') {
+  if (driver === 'docker') {
     core.info('Waiting for Docker to be ready');
     await waitForDocker();
   }
-  await download.installCniPlugins(inputs);
-  await download.installCriCtl(inputs);
-  await download.installCriDockerd(inputs);
+  if (driver === 'none') {
+    await download.installCniPlugins(inputs);
+    await download.installCriCtl(inputs);
+    await download.installCriDockerd(inputs);
+  }
 };
 
 module.exports = configureEnvironment;