Merge pull request #394 from snyk/chore/various-fixes

Chore/various fixes

Author: ivanstanev

test/setup/deployers/operator.ts

@@ -1,27 +1,13 @@
-import { IDeployer } from './types';
+import { IDeployer, IImageOptions } from './types';
 import * as kubectl from '../../helpers/kubectl';
 
 export const operatorDeployer: IDeployer = {
   deploy: deployKubernetesMonitor,
 };
 
 async function deployKubernetesMonitor(
-  integrationId: string,
-  _imageOpts: {
-    imageNameAndTag: string;
-    imagePullPolicy: string;
-  },
+  _imageOptions: IImageOptions,
 ): Promise<void> {
-  const namespace = 'snyk-monitor';
-  await kubectl.createNamespace(namespace);
-
-  const secretName = 'snyk-monitor';
-  const gcrDockercfg = process.env['GCR_IO_DOCKERCFG'] || '{}';
-  await kubectl.createSecret(secretName, namespace, {
-    'dockercfg.json': gcrDockercfg,
-    integrationId,
-  });
-
   await kubectl.applyK8sYaml('./test/fixtures/operator/operator-source.yaml');
   await kubectl.applyK8sYaml('./test/fixtures/operator/installation.yaml');
 

test/setup/deployers/types.ts

@@ -1,9 +1,8 @@
+export interface IImageOptions {
+  nameAndTag: string;
+  pullPolicy: 'Never' | 'Always' | 'IfPresent';
+}
+
 export interface IDeployer {
-  deploy: (
-    integrationId: string,
-    imageOpts: {
-      imageNameAndTag: string;
-      imagePullPolicy: string;
-    },
-  ) => Promise<void>;
+  deploy: (imageOptions: IImageOptions) => Promise<void>;
 }

test/setup/deployers/yaml.ts

@@ -2,31 +2,21 @@ import { readFileSync, writeFileSync } from 'fs';
 import { parse, stringify } from 'yaml';
 
 import * as kubectl from '../../helpers/kubectl';
-import { IDeployer } from './types';
+import { IDeployer, IImageOptions } from './types';
 
 export const yamlDeployer: IDeployer = {
   deploy: deployKubernetesMonitor,
 };
 
 async function deployKubernetesMonitor(
-  integrationId: string,
-  imageOpts: {
-    imageNameAndTag: string;
-    imagePullPolicy: string;
-  },
+  imageOptions: IImageOptions,
 ): Promise<void> {
-  const namespace = 'snyk-monitor';
-  await kubectl.createNamespace(namespace);
-
-  const secretName = 'snyk-monitor';
-  const gcrDockercfg = process.env['GCR_IO_DOCKERCFG'] || '{}';
-  await kubectl.createSecret(secretName, namespace, {
-    'dockercfg.json': gcrDockercfg,
-    integrationId,
-  });
-
   const testYaml = 'snyk-monitor-test-deployment.yaml';
-  createTestYamlDeployment(testYaml, imageOpts.imageNameAndTag, imageOpts.imagePullPolicy);
+  createTestYamlDeployment(
+    testYaml,
+    imageOptions.nameAndTag,
+    imageOptions.pullPolicy,
+  );
 
   await kubectl.applyK8sYaml('./snyk-monitor-cluster-permissions.yaml');
   await kubectl.applyK8sYaml('./snyk-monitor-test-deployment.yaml');
@@ -50,13 +40,6 @@ function createTestYamlDeployment(
     value: 'https://kubernetes-upstream.dev.snyk.io',
   };
 
-  // TODO: remove this hack once an Operator is used to deploy the snyk-monitor for OpenShift tests
-  const testPlatform = process.env['TEST_PLATFORM'] || 'kind';
-  if (testPlatform === 'openshift4') {
-    delete deployment.spec.template.spec.containers[0].securityContext.runAsUser;
-    delete deployment.spec.template.spec.containers[0].securityContext.runAsGroup;
-  }
-
   writeFileSync(newYamlPath, stringify(deployment));
   console.log('Created YAML snyk-monitor deployment');
 }

test/setup/index.ts

@@ -4,6 +4,7 @@ import * as uuidv4 from 'uuid/v4';
 
 import platforms from './platforms';
 import deployers from './deployers';
+import { IImageOptions } from './deployers/types';
 import * as kubectl from '../helpers/kubectl';
 
 const testPlatform = process.env['TEST_PLATFORM'] || 'kind';
@@ -44,6 +45,22 @@ async function createEnvironment(): Promise<void> {
   await sleep(5000);
 }
 
+async function predeploy(integrationId: string): Promise<void> {
+  try {
+    const namespace = 'snyk-monitor';
+    await kubectl.createNamespace(namespace);
+
+    const secretName = 'snyk-monitor';
+    const gcrDockercfg = process.env['GCR_IO_DOCKERCFG'] || '{}';
+    await kubectl.createSecret(secretName, namespace, {
+      'dockercfg.json': gcrDockercfg,
+      integrationId,
+    });
+  } catch (error) {
+    console.log('Could not create namespace and secret, they probably already exist');
+  }
+}
+
 async function createSecretForGcrIoAccess(): Promise<void> {
   const gcrSecretName = 'gcr-io';
   const gcrKubectlSecretsKeyPrefix = '--';
@@ -89,17 +106,15 @@ export async function deployMonitor(): Promise<string> {
     await createSecretForGcrIoAccess();
 
     const integrationId = getIntegrationId();
+    await predeploy(integrationId);
 
     // TODO: hack, rewrite this
     const imagePullPolicy = testPlatform === 'kind' ? 'Never' : 'Always';
-    const deploymentImageOptions = {
-      imageNameAndTag: remoteImageName,
-      imagePullPolicy,
+    const deploymentImageOptions: IImageOptions = {
+      nameAndTag: remoteImageName,
+      pullPolicy: imagePullPolicy,
     };
-    await deployers[deploymentType].deploy(
-      integrationId,
-      deploymentImageOptions,
-    );
+    await deployers[deploymentType].deploy(deploymentImageOptions);
     await kubectl.waitForDeployment('snyk-monitor', 'snyk-monitor');
     console.log(`Deployed the snyk-monitor with integration ID ${integrationId}`);
     return integrationId;