Merge branch 'chore/setup' into staging

Author: Shesekino

test/helpers/kubectl.ts

@@ -37,7 +37,7 @@ export async function createNamespace(namespace: string): Promise<void> {
 
 export async function deleteNamespace(namespace: string): Promise<void> {
   console.log(`Deleting namespace ${namespace}...`);
-  await exec(`./kubectl delete namespace ${namespace}`);
+  await exec(`./kubectl delete namespace ${namespace} --ignore-not-found`);
   console.log(`Deleted namespace ${namespace}`);
 }
 

test/setup/index.ts

@@ -133,6 +133,7 @@ export async function deployMonitor(): Promise<string> {
     console.log(`platform chosen is ${testPlatform}, createCluster===${createCluster}`);
 
     await kubectl.downloadKubectl();
+    await platforms[testPlatform].setupTester();
     if (createCluster) {
       await platforms[testPlatform].create();
       await platforms[testPlatform].config();

test/setup/platforms/eks.ts

@@ -1,6 +1,17 @@
 import { exec } from 'child-process-promise';
 import * as kubectl from '../../helpers/kubectl';
 
+export async function setupTester(): Promise<void> {
+  // update the `aws` CLI, the one in CircleCI's default image is outdated and doens't support eks
+  await exec('pip install awscli --ignore-installed six');
+
+  // TODO: assert all the vars are present before starting the setup?
+  // TODO: wipe out the data during teardown?
+  await exec(`aws configure set aws_access_key_id ${process.env['AWS_ACCESS_KEY_ID']}`);
+  await exec(`aws configure set aws_secret_access_key ${process.env['AWS_SECRET_ACCESS_KEY']}`);
+  await exec(`aws configure set region ${process.env['AWS_REGION']}`);
+}
+
 export async function createCluster(): Promise<void> {
   throw new Error('Not implemented');
 }
@@ -17,15 +28,6 @@ export async function exportKubeConfig(): Promise<void> {
 export async function loadImageInCluster(imageNameAndTag: string): Promise<string> {
   console.log(`Loading image ${imageNameAndTag} in ECR...`);
 
-  // update the `aws` CLI, the one in CircleCI's default image is outdated and doens't support eks
-  await exec('pip install awscli --ignore-installed six');
-
-  // TODO: assert all the vars are present before starting the setup?
-  // TODO: wipe out the data during teardown?
-  await exec(`aws configure set aws_access_key_id ${process.env['AWS_ACCESS_KEY_ID']}`);
-  await exec(`aws configure set aws_secret_access_key ${process.env['AWS_SECRET_ACCESS_KEY']}`);
-  await exec(`aws configure set region ${process.env['AWS_REGION']}`);
-
   const ecrLogin = await exec('aws ecr get-login --region us-east-2 --no-include-email');
 
   // aws ecr get-login returns something that looks like:

test/setup/platforms/index.ts

@@ -12,6 +12,8 @@ interface IPlatformSetup {
   config: () => Promise<void>;
   // clean up whatever we littered an existing cluster with
   clean: () => Promise<void>;
+  // set up host requirements specific to this platform
+  setupTester: () => Promise<void>;
 }
 
 const kindSetup: IPlatformSetup = {
@@ -20,6 +22,7 @@ const kindSetup: IPlatformSetup = {
   delete: kind.deleteCluster,
   config: kind.exportKubeConfig,
   clean: kind.clean,
+  setupTester: kind.setupTester,
 };
 
 const eksSetup: IPlatformSetup = {
@@ -28,6 +31,7 @@ const eksSetup: IPlatformSetup = {
   delete: eks.deleteCluster,
   config: eks.exportKubeConfig,
   clean: eks.clean,
+  setupTester: eks.setupTester,
 };
 
 export default {

test/setup/platforms/kind.ts

@@ -6,10 +6,24 @@ import * as needle from 'needle';
 
 const clusterName = 'kind';
 
-export async function createCluster(): Promise<void> {
+export async function setupTester(): Promise<void> {
   const osDistro = platform();
   await download(osDistro);
-  await createKindCluster(clusterName);
+}
+
+export async function createCluster(): Promise<void> {
+  // available tags may be viewed at https://hub.docker.com/r/kindest/node/tags
+  const kindImageTag = 'latest';
+  console.log(`Creating cluster "${clusterName}" with Kind image tag ${kindImageTag}...`);
+
+  let kindImageArgument = '';
+  if (kindImageTag !== 'latest') {
+    // not specifying the "--image" argument tells Kind to pick the latest image
+    // which does not necessarily have the "latest" tag
+    kindImageArgument = `--image="kindest/node:${kindImageTag}"`;
+  }
+  await exec(`./kind create cluster --name="${clusterName}" ${kindImageArgument}`);
+  console.log(`Created cluster ${clusterName}!`);
 }
 
 export async function deleteCluster(): Promise<void> {
@@ -61,17 +75,3 @@ async function download(osDistro: string): Promise<void> {
     console.log('KinD downloaded!');
   }
 }
-
-// available tags may be viewed at https://hub.docker.com/r/kindest/node/tags
-async function createKindCluster(clusterName, kindImageTag = 'latest'): Promise<void> {
-  console.log(`Creating cluster "${clusterName}" with Kind image tag ${kindImageTag}...`);
-
-  let kindImageArgument = '';
-  if (kindImageTag !== 'latest') {
-    // not specifying the "--image" argument tells Kind to pick the latest image
-    // which does not necessarily have the "latest" tag
-    kindImageArgument = `--image="kindest/node:${kindImageTag}"`;
-  }
-  await exec(`./kind create cluster --name="${clusterName}" ${kindImageArgument}`);
-  console.log(`Created cluster ${clusterName}!`);
-}

test/system/kind.test.ts

@@ -48,6 +48,7 @@ tap.test('Kubernetes-Monitor with KinD', async (t) => {
   await kubectl.downloadKubectl();
 
   // KinD
+  await kind.setupTester();
   await kind.createCluster();
   await kind.exportKubeConfig();