README.md

@@ -1,16 +1,21 @@
 # Minikube setup action
 
 Action installs minikube to hosted VM environment.
+Minikube is installed and configured to run on Docker with self hosted registry.
+
+## Registries
+
+Custom registry runs on port 5000.
 
 ## Inputs
 
 ### `minikube-version`
 
-**Required** Minikube version. Default `"1.4.0"`.
+Minikube version. Default `"1.4.0"`.
 
 ### `k8s-version`
 
-**Required** Version of Kubernetes you wish to use with Minikube. Default `"1.14.6"`.
+Version of Kubernetes you wish to use with Minikube. Default `"1.14.6"`.
 
 ## Example usage
 ```

action.yml

@@ -1,20 +1,21 @@
 name: 'Minikube setup with registry'
-description: 'Installs minikube in  Github Actions.'
+author: Enmasse Project
+description: 'Installs minikube in Github Actions with custom registry.'
 branding:
   icon: 'cloud'
   color: 'blue'
 inputs:
   minikube-version:
     description: 'Minikube version to install'
     required: false
-    default: '1.4.0'
+    default: '1.15.1'
   k8s-version:
     description: 'Kubernetes version to install'
     required: false
-    default: '1.15.0'
+    default: '1.19.0'
 outputs:
   launcher:
     description: 'Command to execute to launch minikube'
 runs:
   using: 'node12'
-  main: 'src/index.js'
+  main: 'src/index.js'

package.json

@@ -8,16 +8,16 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodingNagger/minikube-setup-action.git"
+    "url": "git+https://github.com/EnMasseProject/minikube-setup.git"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/CodingNagger/minikube-setup-action/issues"
+    "url": "https://github.com/EnMasseProject/minikube-setup/issues"
   },
-  "homepage": "https://github.com/CodingNagger/minikube-setup-action#readme",
+  "homepage": "https://github.com/EnMasseProject/minikube-setup#readme",
   "dependencies": {
-    "@actions/core": "^1.2.0"
+    "@actions/core": "^1.2.6"
   }
 }

src/index.js

@@ -7,12 +7,13 @@ const sleep = (milliseconds) => {
 
 
 function execute_command(command, args) {
+    core.info(`Run ${command} ${args}`);
     var result = spawnSync(command, args);
     if(result.status == 0) {
-        core.info(`${result.stdout.toString()}`);
+        core.info(`${String(result.stdout)}`);
         return 0;
     } else {
-        core.error(`${result.stderr.toString()}`);
+        core.error(`${String(result.stderr)}`);
         return 1;
     }
 }
@@ -34,44 +35,61 @@ function wait_for_minikube() {
     core.setFailed("Minikube failed to start or RBAC could not be properly set up");
 }
 
+function install_deps() {
+    var startCommand = 'sudo';
+    var startArgs = ['-E', 'apt-get', 'install', 'conntrack'];
+    return execute_command(startCommand, startArgs);
+}
+
 function install_minikube() {
     const minikubeVersion = core.getInput('minikube-version');
     core.info(`Downloading Minikube...`);
     var kubeDownCommand = 'curl';
-    var kubeDownArgs = ['-LO', `https://storage.googleapis.com/minikube/releases/latest/minikube_${minikubeVersion}.deb`];
+    var kubeDownArgs = ['-LO', `https://storage.googleapis.com/minikube/releases/latest/minikube_${minikubeVersion}-0_amd64.deb`];
     if (execute_command(kubeDownCommand, kubeDownArgs) == 1) return 1;
 
     core.info(`Installing Minikube...`);
     var kubeInstallCommand = 'sudo';
-    var kubeInstallArgs = ['dpkg', '-i', `minikube_${minikubeVersion}.deb`];
+    var kubeInstallArgs = ['dpkg', '-i', `minikube_${minikubeVersion}-0_amd64.deb`];
     return execute_command(kubeInstallCommand, kubeInstallArgs);
 }
 
 function run_registry() {
     core.info(`Running registry...`);
     var registryCommand = 'docker';
-    var registryArgs = ['run', '-d', '-p', '5000:5000', 'registry'];
+    var registryArgs = ['run', '--name', 'image-registry', '-d', '-p', '5000:5000', '--restart=always', 'registry'];
     return execute_command(registryCommand, registryArgs);
 }
 
 function start_minikube() {
     const kubernetesVersion = core.getInput('k8s-version');
-    core.exportVariable('CHANGE_MINIKUBE_NONE_USER', 'true');
-    var startCommand = 'sudo';
-    var startArgs = ['-E', 'minikube', 'start', '--vm-driver=none', '--kubernetes-version',
-    `v${kubernetesVersion}`, '--insecure-registry=localhost:5000', '--extra-config=kubeadm.ignore-preflight-errors=SystemVerification', '--extra-config=apiserver.authorization-mode=RBAC']
+    core.exportVariable('CHANGE_MINIKUBE_NONE_USER', true);
+    var startCommand = 'minikube';
+    var startArgs = ['start', '--vm-driver=docker', '--kubernetes-version',
+    `v${kubernetesVersion}`, '--extra-config=kubeadm.ignore-preflight-errors=SystemVerification', '--extra-config=apiserver.authorization-mode=RBAC,Node']
+
     if(execute_command(startCommand, startArgs) == 1) return 1;
 
-    var addonsCommand = 'sudo';
-    var addonsArgs = ['-E', 'minikube', 'addons', 'enable', 'default-storageclass'];
-    return execute_command(addonsCommand, addonsArgs);
+    var addons = ['default-storageclass', 'ingress'];
+    for (var i in addons) {
+        var addon = addons[i];
+        var addonsCommand = 'sudo';
+        var addonsArgs = ['-E', 'minikube', 'addons', 'enable', addon];
+        if (execute_command(addonsCommand, addonsArgs) == 1) return 1;
+    }
+
+
+    // Enable SSL passthrough support
+    var ingressCommand = 'kubectl';
+    var ingressArgs = ['patch', 'deployment', 'ingress-nginx-controller', '-n', 'kube-system', '--type=json', '-p', '[{"op" : "add", "path" : "/spec/template/spec/containers/0/args/-", "value" : "--enable-ssl-passthrough"}]']
+    return execute_command(ingressCommand, ingressArgs);
 }
 
 try {
-    if (install_minikube() || run_registry() || start_minikube() || wait_for_minikube()) {
+    if (install_deps() || install_minikube() || run_registry() || start_minikube() || wait_for_minikube()) {
         core.setFailed(error.message);    
     }
 
 } catch (error) {
     core.setFailed(error.message);
-}
+}