Merge pull request #1055 from snyk/feat/configurable_keepalive

[RUN-2187] Make keepalive configurable

Author: KatieArmstr

config.default.json

@@ -16,5 +16,6 @@
   "QUEUE_LENGTH_LOG_FREQUENCY_MINUTES": 1,
   "INTEGRATION_ID": "",
   "DEFAULT_KUBERNETES_UPSTREAM_URL": "https://kubernetes-upstream.snyk.io",
-  "MAX_RETRY_BACKOFF_DURATION_SECONDS": 300
+  "MAX_RETRY_BACKOFF_DURATION_SECONDS": 300,
+  "USE_KEEPALIVE": true
 }

snyk-monitor/templates/deployment.yaml

@@ -127,6 +127,8 @@ spec:
             value: {{ .Values.https_proxy }}
           - name: NO_PROXY
             value: {{ .Values.no_proxy }}
+          - name: USE_KEEPALIVE
+            value: {{ quote .Values.use_keepalive }}
           - name: LOG_LEVEL
             value: {{ .Values.log_level }}
           - name: SKIP_K8S_JOBS

snyk-monitor/values.yaml

@@ -91,6 +91,7 @@ limits:
 http_proxy:
 https_proxy:
 no_proxy:
+use_keepalive: true
 skip_k8s_jobs:
 
 # Override default (INFO) log level if less verbosity needed

snyk-operator-certified/helm-charts/snyk-monitor/templates/deployment.yaml

@@ -111,6 +111,8 @@ spec:
             value: {{ .Values.https_proxy }}
           - name: NO_PROXY
             value: {{ .Values.no_proxy }}
+          - name: USE_KEEPALIVE
+            value: {{ quote .Values.use_keepalive }}
           - name: LOG_LEVEL
             value: {{ .Values.log_level }}
           - name: SKIP_K8S_JOBS

snyk-operator-certified/helm-charts/snyk-monitor/values.yaml

@@ -83,6 +83,7 @@ limits:
 http_proxy:
 https_proxy:
 no_proxy:
+use_keepalive: true
 skip_k8s_jobs:
 
 # Override default (INFO) log level if less verbosity needed

src/common/config.ts

@@ -59,6 +59,7 @@ if (config.SYSDIG_ENDPOINT && config.SYSDIG_TOKEN) {
 config.HTTPS_PROXY = process.env['HTTPS_PROXY'];
 config.HTTP_PROXY = process.env['HTTP_PROXY'];
 config.NO_PROXY = process.env['NO_PROXY'];
+config.USE_KEEPALIVE = process.env.USE_KEEPALIVE === 'true';
 delete process.env['HTTPS_PROXY'];
 delete process.env['HTTP_PROXY'];
 delete process.env['NO_PROXY'];

src/common/types.ts

@@ -31,6 +31,7 @@ export interface Config {
   HTTPS_PROXY: string | undefined;
   HTTP_PROXY: string | undefined;
   NO_PROXY: string | undefined;
+  USE_KEEPALIVE: boolean;
   SKIP_K8S_JOBS: boolean;
   DEPLOYMENT_NAME: string;
   DEPLOYMENT_NAMESPACE: string;

src/index.ts

@@ -13,15 +13,15 @@ import { setSnykMonitorAgentId } from './supervisor/agent';
 import { scrapeData } from './data-scraper';
 import { setupHealthCheck } from './healthcheck';
 
-process.on('uncaughtException', (err) => {
+process.on('uncaughtException', (error) => {
   if (state.shutdownInProgress) {
     return;
   }
 
   try {
-    logger.error({ err }, 'UNCAUGHT EXCEPTION!');
+    logger.error({ error }, 'UNCAUGHT EXCEPTION!');
   } catch (ignore) {
-    console.log('UNCAUGHT EXCEPTION!', err);
+    console.log('UNCAUGHT EXCEPTION!', error);
   } finally {
     process.exit(1);
   }

src/scanner/images/credentials.ts

@@ -77,11 +77,11 @@ export function ecrRegionFromFullImageName(imageFullName: string): string {
       throw new Error('ECR image full name in unexpected format');
     }
     return parts[3];
-  } catch (err) {
+  } catch (error) {
     logger.error(
-      { err, imageFullName },
+      { error, imageFullName },
       'failed extracting ECR region from image full name',
     );
-    throw err;
+    throw error;
   }
 }

src/scanner/images/index.ts

@@ -138,9 +138,9 @@ export async function scanImages(
           telemetry.imageSizeBytes = 0;
         }
         telemetry.imageSizeBytes += fileStats.size;
-      } catch (err) {
+      } catch (error) {
         logger.warn(
-          { error: err, imageName, imageWithDigest, fileSystemPath },
+          { error, imageName, imageWithDigest, fileSystemPath },
           'could not determine archive size',
         );
       }