Merge pull request #419 from snyk/chore/deploy-with-helm

chore/deploy with helm

Author: ivanstanev

.circleci/config.yml

@@ -136,13 +136,10 @@ jobs:
     <<: *default_machine_config
     steps:
       - checkout
+      - setup_node12
       - run:
           name: Unit tests
           command: |
-            export NVM_DIR="/opt/circleci/.nvm" &&
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" &&
-            nvm install v12 &&
-            npm install &&
             npm run lint &&
             npm run build &&
             npm run test:unit
@@ -160,13 +157,10 @@ jobs:
     <<: *default_machine_config
     steps:
       - checkout
+      - setup_node12
       - run:
           name: System tests
           command: |
-            export NVM_DIR="/opt/circleci/.nvm" &&
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" &&
-            nvm install v12 &&
-            npm install &&
             npm run build &&
             npm run test:system
       - run:
@@ -183,20 +177,14 @@ jobs:
     <<: *default_machine_config
     steps:
       - checkout
+      - setup_node12
       - run:
           name: create temp dir for logs
           command: mkdir -p /tmp/logs/test/integration/kind
       - run:
           name: Integration tests
           command: |
-            export NVM_DIR="/opt/circleci/.nvm" &&
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" &&
-            nvm install v12 &&
-            npm install &&
-            docker login --username ${DOCKERHUB_USER} --password ${DOCKERHUB_PASSWORD} &&
-            export IMAGE_TAG=$([[ "$CIRCLE_BRANCH" == "staging" ]] && echo "staging-candidate" || echo "discardable") &&
-            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=snyk/kubernetes-monitor:${IMAGE_TAG}-${CIRCLE_SHA1} &&
-            docker pull ${KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG} &&
+            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
             npm run test:integration
       - run:
           name: Notify Slack on failure
@@ -210,24 +198,43 @@ jobs:
       - store_artifacts:
           path: /tmp/logs/test/integration/kind
 
+  integration_tests_helm:
+    <<: *default_machine_config
+    steps:
+      - checkout
+      - setup_node12
+      - run:
+          name: Create temporary directory for logs
+          command: mkdir -p /tmp/logs/test/integration/kind-helm
+      - run:
+          name: Integration tests with Helm deployment
+          command: |
+            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
+            npm run test:integration:kind:helm
+      - run:
+          name: Notify Slack on failure
+          command: |
+            if [[ "$CIRCLE_BRANCH" == "staging" ]]; then
+              ./scripts/slack-notify-failure.sh "staging-integration-helm-tests-${CIRCLE_SHA1}"
+            else
+              echo "Current branch is $CIRCLE_BRANCH so skipping notifying Slack"
+            fi
+          when: on_fail
+      - store_artifacts:
+          path: /tmp/logs/test/integration/kind-helm
+
   eks_integration_tests:
     <<: *default_machine_config
     steps:
       - checkout
+      - setup_node12
       - run:
           name: Create temp dir for logs
           command: mkdir -p /tmp/logs/test/integration/eks
       - run:
           name: Integration tests EKS
           command: |
-            export NVM_DIR="/opt/circleci/.nvm" &&
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" &&
-            nvm install v12 &&
-            npm install &&
-            docker login --username ${DOCKERHUB_USER} --password ${DOCKERHUB_PASSWORD} &&
-            export IMAGE_TAG=$([[ "$CIRCLE_BRANCH" == "staging" ]] && echo "staging-candidate" || echo "discardable") &&
-            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=snyk/kubernetes-monitor:${IMAGE_TAG}-${CIRCLE_SHA1} &&
-            docker pull ${KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG} &&
+            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
             .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:eks
       - run:
           name: Notify Slack on failure
@@ -252,7 +259,7 @@ jobs:
       - run:
           name: Integration tests OpenShift 3
           command: |
-            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-openshift3-integration-tests.py)
+            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
             npm run test:integration:openshift3
       - run:
           name: Notify Slack on failure
@@ -265,6 +272,7 @@ jobs:
     <<: *default_machine_config
     steps:
       - checkout
+      - setup_node12
       - run:
           name: create temp dir for logs
           command: mkdir -p /tmp/logs/test/integration/openshift4
@@ -275,14 +283,7 @@ jobs:
       - run:
           name: Integration tests OpenShift 4
           command: |
-            export NVM_DIR="/opt/circleci/.nvm" &&
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" &&
-            nvm install v12 &&
-            npm install &&
-            docker login --username ${DOCKERHUB_USER} --password ${DOCKERHUB_PASSWORD} &&
-            export IMAGE_TAG=$([[ "$CIRCLE_BRANCH" == "staging" ]] && echo "staging-candidate" || echo "discardable") &&
-            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=snyk/kubernetes-monitor:${IMAGE_TAG}-${CIRCLE_SHA1} &&
-            docker pull ${KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG} &&
+            export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
             .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:openshift4
       - run:
           name: Delete Operator from Quay
@@ -434,6 +435,10 @@ workflows:
           requires:
             - build_image
           <<: *main_branches_filter
+      - integration_tests_helm:
+          requires:
+            - build_image
+          <<: *main_branches_filter
 
   MERGE_TO_STAGING:
     jobs:
@@ -453,6 +458,10 @@ workflows:
           requires:
             - build_image
           <<: *staging_branch_only_filter
+      - integration_tests_helm:
+          requires:
+            - build_image
+          <<: *staging_branch_only_filter
       - eks_integration_tests:
           requires:
             - build_image
@@ -474,6 +483,7 @@ workflows:
             - unit_tests
             - system_tests
             - integration_tests
+            - integration_tests_helm
           <<: *staging_branch_only_filter
       - deploy_dev:
           requires:

.gitignore

@@ -48,6 +48,7 @@ config.local.json
 kind
 kubectl
 oc
+helm
 kubeconfig-integration-test-kind
 snyk-monitor-test-deployment.yaml
 snyk-operator/helm-charts

package.json

@@ -9,6 +9,7 @@
     "test:system": "tap test/system --timeout=600",
     "test:integration": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=kind CREATE_CLUSTER=true tap test/integration/kubernetes.test.ts --timeout=900",
     "test:integration:kind": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=kind CREATE_CLUSTER=true tap test/integration/kubernetes.test.ts --timeout=900",
+    "test:integration:kind:helm": "DEPLOYMENT_TYPE=Helm TEST_PLATFORM=kind CREATE_CLUSTER=true tap test/integration/kubernetes.test.ts --timeout=900",
     "test:integration:eks": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=eks CREATE_CLUSTER=false tap test/integration/kubernetes.test.ts --timeout=900",
     "test:integration:openshift3": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=openshift3 CREATE_CLUSTER=true tap test/integration/kubernetes.test.ts --timeout=900",
     "test:integration:openshift4": "DEPLOYMENT_TYPE=Operator TEST_PLATFORM=openshift4 CREATE_CLUSTER=false tap test/integration/kubernetes.test.ts --timeout=900",

scripts/circleci-jobs/setup-openshift3-integration-tests.py renamed to scripts/circleci-jobs/setup-integration-tests.py

@@ -0,0 +1,45 @@
+import { exec } from 'child-process-promise';
+import { platform } from 'os';
+
+import { IDeployer, IImageOptions } from './types';
+import { existsSync, chmodSync } from 'fs';
+
+const helmVersion = '3.0.0';
+const helmPath = './helm';
+const helmChartPath = './snyk-monitor';
+
+export const helmDeployer: IDeployer = {
+  deploy: deployKubernetesMonitor,
+};
+
+async function deployKubernetesMonitor(
+  imageOptions: IImageOptions,
+): Promise<void> {
+  if (!existsSync(helmPath)) {
+    await downloadHelm();
+  }
+
+  const imageNameAndTag = imageOptions.nameAndTag.split(':');
+  const imageName = imageNameAndTag[0];
+  const imageTag = imageNameAndTag[1];
+  const imagePullPolicy = imageOptions.pullPolicy;
+
+  await exec(
+    `${helmPath} upgrade --install snyk-monitor ${helmChartPath} --namespace snyk-monitor ` +
+      `--set image.repository=${imageName} ` +
+      `--set image.tag=${imageTag} ` +
+      `--set image.pullPolicy=${imagePullPolicy} ` +
+      '--set integrationApi=https://kubernetes-upstream.dev.snyk.io',
+  );
+  console.log(`Deployed ${imageOptions.nameAndTag} with pull policy ${imageOptions.pullPolicy}`);
+}
+
+async function downloadHelm(): Promise<void> {
+  console.log(`Downloading Helm ${helmVersion}...`);
+  const os = platform();
+  await exec(
+    `curl https://get.helm.sh/helm-v${helmVersion}-${os}-amd64.tar.gz | tar xfzO - ${os}-amd64/helm > ${helmPath}`,
+  );
+  chmodSync(helmPath, 0o755); // rwxr-xr-x
+  console.log('Downloaded Helm');
+}

test/setup/deployers/helm.ts

@@ -1,7 +1,9 @@
 import { yamlDeployer } from './yaml';
 import { operatorDeployer } from './operator';
+import { helmDeployer } from './helm';
 
 export default {
   YAML: yamlDeployer,
   Operator: operatorDeployer,
+  Helm: helmDeployer,
 };