Merge pull request #930 from snyk/feat/operator-resources

Feat/operator resources

Author: ivanstanev

scripts/operator/package_operator_bundle.py

@@ -36,9 +36,8 @@ def createOperatorFromTemplate(new_version: str, new_operator_tag: str, new_moni
                     'SNYK_OPERATOR_VERSION_OVERRIDE', new_version).replace(
                         'SNYK_OPERATOR_IMAGE_TAG_OVERRIDE', new_operator_tag).replace(
                             'SNYK_MONITOR_IMAGE_TAG_OVERRIDE', new_monitor_tag)
-        # TODO: Uncomment (or revert commit) once v1.68.2 is published in OperatorHub
-        # if old_version != None:
-        #     updated_csv = updated_csv + "  replaces: snyk-operator.v" + old_version
+        if old_version != None:
+            updated_csv = updated_csv + "  replaces: snyk-operator.v" + old_version
     with open(new_csv_path, "w") as f:
         f.write(updated_csv)
 

snyk-operator-certified/bundle/manifests/snyk-monitor.clusterserviceversion.yaml

@@ -35,6 +35,12 @@ metadata:
             "pvc": {
               "enabled": false,
               "name": "snyk-monitor"
+            },
+            "requests": {
+              "memory": "400Mi"
+            },
+            "limits": {
+              "memory": "2Gi"
             }
           }
         }
@@ -118,6 +124,18 @@ spec:
             path: initContainerImage.image
             x-descriptors:
               - urn:alm:descriptor:text
+          - description: >-
+              The memory requested by the Snyk controller.
+            displayName: Memory request
+            path: requests.memory
+            x-descriptors:
+              - "urn:alm:descriptor:text"
+          - description: >-
+              The memory limit for the Snyk controller.
+            displayName: Memory limit
+            path: limits.memory
+            x-descriptors:
+              - "urn:alm:descriptor:text"
         version: v1alpha1
   description: |-
     A Kubernetes Operator for creating and managing Snyk Kubernetes controller instances.

snyk-operator-certified/config/manifests/bases/snyk-monitor.clusterserviceversion.yaml

@@ -28,6 +28,12 @@ metadata:
             "initContainerImage": {
               "repository": "registry.access.redhat.com/ubi8-minimal",
               "tag": "latest"
+            },
+            "requests": {
+              "memory": "400Mi"
+            },
+            "limits": {
+              "memory": "2Gi"
             }
           }
         }
@@ -100,6 +106,18 @@ spec:
         path: image.tag
         x-descriptors:
         - urn:alm:descriptor:text
+      - description: >-
+          The memory requested by the Snyk controller.
+        displayName: Memory request
+        path: requests.memory
+        x-descriptors:
+          - "urn:alm:descriptor:text"
+      - description: >-
+          The memory limit for the Snyk controller.
+        displayName: Memory limit
+        path: limits.memory
+        x-descriptors:
+          - "urn:alm:descriptor:text"
       version: v1alpha1
   description: |-
     A Kubernetes Operator for creating and managing Snyk Kubernetes controller instances.

snyk-operator/deploy/olm-catalog/snyk-operator/0.0.0/snyk-operator.v0.0.0.clusterserviceversion.yaml

@@ -30,6 +30,12 @@ metadata:
             "initContainerImage": {
               "repository": "busybox",
               "tag": "latest"
+            },
+            "requests": {
+              "memory": "400Mi"
+            },
+            "limits": {
+              "memory": "2Gi"
             }
           }
         }
@@ -153,6 +159,18 @@ spec:
             path: initContainerImage.tag
             x-descriptors:
               - "urn:alm:descriptor:text"
+          - description: >-
+              The memory requested by the Snyk controller.
+            displayName: Memory request
+            path: requests.memory
+            x-descriptors:
+              - "urn:alm:descriptor:text"
+          - description: >-
+              The memory limit for the Snyk controller.
+            displayName: Memory limit
+            path: limits.memory
+            x-descriptors:
+              - "urn:alm:descriptor:text"
   description: |-
     A Kubernetes Operator for creating and managing Snyk Kubernetes controller instances.
 

snyk-operator/deploy/olm-catalog/snyk-operator/0.0.0/snykmonitors.charts.helm.k8s.io.crd.yaml

@@ -71,3 +71,13 @@ spec:
                     tag:
                       type: string
                   type: object
+                requests:
+                  properties:
+                    memory:
+                      type: string
+                  type: object
+                limits:
+                  properties:
+                    memory:
+                      type: string
+                  type: object

src/supervisor/kuberenetes-api-wrappers.ts

@@ -71,7 +71,7 @@ export async function retryKubernetesApiRequestIndefinitely<ResponseType>(
 }
 
 export function calculateSleepSeconds(
-  httpResponse: http.IncomingMessage,
+  httpResponse?: http.IncomingMessage,
 ): number {
   let sleepSeconds = DEFAULT_SLEEP_SEC;
   if (

src/supervisor/watchers/handlers/cron-job.ts

@@ -1,7 +1,28 @@
-import { V1beta1CronJob } from '@kubernetes/client-node';
+import { V1beta1CronJob, V1beta1CronJobList } from '@kubernetes/client-node';
 import { deleteWorkload } from './workload';
 import { WorkloadKind } from '../../types';
 import { FALSY_WORKLOAD_NAME_MARKER } from './types';
+import { IncomingMessage } from 'http';
+import { k8sApi } from '../../cluster';
+import { paginatedList } from './pagination';
+
+export async function paginatedCronJobList(namespace: string): Promise<{
+  response: IncomingMessage;
+  body: V1beta1CronJobList;
+}> {
+  const v1CronJobList = new V1beta1CronJobList();
+  v1CronJobList.apiVersion = 'batch/v1beta1';
+  v1CronJobList.kind = 'CronJobList';
+  v1CronJobList.items = new Array<V1beta1CronJob>();
+
+  return await paginatedList(
+    namespace,
+    v1CronJobList,
+    k8sApi.batchUnstableClient.listNamespacedCronJob.bind(
+      k8sApi.batchUnstableClient,
+    ),
+  );
+}
 
 export async function cronJobWatchHandler(
   cronJob: V1beta1CronJob,

src/supervisor/watchers/handlers/daemon-set.ts

@@ -1,7 +1,26 @@
-import { V1DaemonSet } from '@kubernetes/client-node';
+import { V1DaemonSet, V1DaemonSetList } from '@kubernetes/client-node';
 import { deleteWorkload } from './workload';
 import { WorkloadKind } from '../../types';
 import { FALSY_WORKLOAD_NAME_MARKER } from './types';
+import { IncomingMessage } from 'http';
+import { k8sApi } from '../../cluster';
+import { paginatedList } from './pagination';
+
+export async function paginatedDaemonSetList(namespace: string): Promise<{
+  response: IncomingMessage;
+  body: V1DaemonSetList;
+}> {
+  const v1DaemonSetList = new V1DaemonSetList();
+  v1DaemonSetList.apiVersion = 'apps/v1';
+  v1DaemonSetList.kind = 'DaemonSetList';
+  v1DaemonSetList.items = new Array<V1DaemonSet>();
+
+  return await paginatedList(
+    namespace,
+    v1DaemonSetList,
+    k8sApi.appsClient.listNamespacedDaemonSet.bind(k8sApi.appsClient),
+  );
+}
 
 export async function daemonSetWatchHandler(
   daemonSet: V1DaemonSet,

src/supervisor/watchers/handlers/deployment-config.ts

@@ -1,6 +1,50 @@
+import { IncomingMessage } from 'http';
 import { deleteWorkload } from './workload';
 import { WorkloadKind } from '../../types';
-import { FALSY_WORKLOAD_NAME_MARKER, V1DeploymentConfig } from './types';
+import {
+  FALSY_WORKLOAD_NAME_MARKER,
+  V1DeploymentConfig,
+  V1DeploymentConfigList,
+} from './types';
+import { paginatedList } from './pagination';
+import { k8sApi } from '../../cluster';
+
+export async function paginatedDeploymentConfigList(
+  namespace: string,
+): Promise<{
+  response: IncomingMessage;
+  body: V1DeploymentConfigList;
+}> {
+  const v1DeploymentConfigList = new V1DeploymentConfigList();
+  v1DeploymentConfigList.apiVersion = 'apps.openshift.io/v1';
+  v1DeploymentConfigList.kind = 'DeploymentConfigList';
+  v1DeploymentConfigList.items = new Array<V1DeploymentConfig>();
+
+  return await paginatedList(
+    namespace,
+    v1DeploymentConfigList,
+    async (
+      namespace: string,
+      pretty?: string,
+      _allowWatchBookmarks?: boolean,
+      _continue?: string,
+      fieldSelector?: string,
+      labelSelector?: string,
+      limit?: number,
+    ) =>
+      k8sApi.customObjectsClient.listNamespacedCustomObject(
+        'apps.openshift.io',
+        'v1',
+        namespace,
+        'deploymentconfigs',
+        pretty,
+        _continue,
+        fieldSelector,
+        labelSelector,
+        limit,
+      ) as any,
+  );
+}
 
 export async function deploymentConfigWatchHandler(
   deploymentConfig: V1DeploymentConfig,

src/supervisor/watchers/handlers/deployment.ts

@@ -1,7 +1,26 @@
-import { V1Deployment } from '@kubernetes/client-node';
+import { V1Deployment, V1DeploymentList } from '@kubernetes/client-node';
 import { deleteWorkload } from './workload';
 import { WorkloadKind } from '../../types';
 import { FALSY_WORKLOAD_NAME_MARKER } from './types';
+import { IncomingMessage } from 'http';
+import { k8sApi } from '../../cluster';
+import { paginatedList } from './pagination';
+
+export async function paginatedDeploymentList(namespace: string): Promise<{
+  response: IncomingMessage;
+  body: V1DeploymentList;
+}> {
+  const v1DeploymentList = new V1DeploymentList();
+  v1DeploymentList.apiVersion = 'apps/v1';
+  v1DeploymentList.kind = 'DeploymentList';
+  v1DeploymentList.items = new Array<V1Deployment>();
+
+  return await paginatedList(
+    namespace,
+    v1DeploymentList,
+    k8sApi.appsClient.listNamespacedDeployment.bind(k8sApi.appsClient),
+  );
+}
 
 export async function deploymentWatchHandler(
   deployment: V1Deployment,