Merge pull request #919 from snyk/chore/operator

Chore/operator

Author: ivanstanev

scripts/operator/package_operator_bundle.py

@@ -36,8 +36,9 @@ 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)
-        if old_version != None:
-            updated_csv = updated_csv + "  replaces: snyk-operator.v" + old_version
+        # 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
     with open(new_csv_path, "w") as f:
         f.write(updated_csv)
 

snyk-operator-certified/Makefile

@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 1.67.2
+VERSION ?= 1.68.2
 # Default bundle image tag
 BUNDLE_IMG ?= snyk/snyk-operator-bundle:$(VERSION)
 # Options for 'bundle-build'

snyk-operator-certified/README.md

@@ -6,7 +6,7 @@ chmod +x opm
 ```
 
 ```sh
-export VERSION=1.67.2-pre0
+export VERSION=1.68.2-pre0
 make docker-build
 docker tag snyk/snyk-operator-bundle:$VERSION <operator-certification-repo>:$VERSION
 docker push registry.connect.redhat.com/snyk/kubernetes-operator:$VERSION
@@ -26,7 +26,7 @@ metadata:
   namespace: openshift-marketplace
 spec:
   sourceType: grpc
-  image: docker.io/snyk/snyk-operator-index:1.67.2
+  image: docker.io/snyk/snyk-operator-index:1.68.2
   displayName: Snyk Operator Bundle
   publisher: Snyk Ltd.
   updateStrategy:

snyk-operator-certified/bundle.Dockerfile

@@ -14,7 +14,7 @@ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
 
 # Labels added in accord with the documentation
 # https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/bundle-directory/managing-openshift-versions
-LABEL com.redhat.openshift.versions="v4.5-v4.9"
+LABEL com.redhat.openshift.versions="v4.8"
 LABEL com.redhat.delivery.operator.bundle=true
 LABEL com.redhat.delivery.backport=true
 

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

@@ -3,7 +3,7 @@ kind: ClusterServiceVersion
 metadata:
   labels:
     app.kubernetes.io/instance: snyk-operator-marketplace
-    app.kubernetes.io/version: 1.67.2
+    app.kubernetes.io/version: 1.68.2
     app.kubernetes.io/name: snyk-operator-marketplace
     app.kubernetes.io/managed-by: snyk-operator-marketplace
   annotations:
@@ -16,14 +16,14 @@ metadata:
             "name": "snyk-monitor",
             "labels": {
               "app.kubernetes.io/instance": "snyk-monitor",
-              "app.kubernetes.io/version": "1.67.2",
+              "app.kubernetes.io/version": "1.68.2",
               "app.kubernetes.io/name": "snyk-monitor",
               "app.kubernetes.io/managed-by": "snyk-operator"
             },
             "annotations": {
               "productID": "snyk-operator-marketplace",
               "productName": "snyk-operator-marketplace",
-              "productVersion": "1.67.2"
+              "productVersion": "1.68.2"
             }
           },
           "spec": {
@@ -39,21 +39,21 @@ metadata:
           }
         }
       ]
-    "olm.properties": '[{"type": "olm.maxOpenShiftVersion", "value": "4.8"}]'
+    "olm.skipRange": "<1.68.2"
     capabilities: Basic Install
     categories: Developer Tools
     certified: "true"
     productID: snyk-operator-marketplace
     productName: snyk-operator-marketplace
-    productVersion: 1.67.2
-    containerImage: registry.connect.redhat.com/snyk/kubernetes-operator:1.67.2
+    productVersion: 1.68.2
+    containerImage: registry.connect.redhat.com/snyk/kubernetes-operator:1.68.2
     createdAt: "2021-06-04T00:20:21Z"
     description: A Kubernetes Operator for creating and managing Snyk controller instances.
     operators.operatorframework.io/builder: operator-sdk-v1.3.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/docker.io/snyk/kubernetes-monitor
     support: Snyk Ltd.
-  name: snyk-operator-marketplace.v1.67.2
+  name: snyk-operator-marketplace.v1.68.2
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
@@ -248,7 +248,7 @@ spec:
                   control-plane: controller-manager
               spec:
                 containers:
-                  - image: registry.connect.redhat.com/snyk/kubernetes-operator:1.67.2
+                  - image: registry.connect.redhat.com/snyk/kubernetes-operator:1.68.2
                     name: operator
                     resources:
                       limits:
@@ -277,7 +277,7 @@ spec:
                       - name: OPERATOR_NAME
                         value: snyk-operator
                       - name: RELATED_IMAGE_DEPLOYMENT
-                        value: registry.connect.redhat.com/snyk/kubernetes-monitor:1.67.2
+                        value: registry.connect.redhat.com/snyk/kubernetes-monitor:1.68.2
                       - name: RELATED_IMAGE_DEPLOYMENT_INIT
                         value: registry.access.redhat.com/ubi8-minimal:latest
                   - args:
@@ -352,4 +352,4 @@ spec:
   maturity: stable
   provider:
     name: Snyk Ltd.
-  version: 1.67.2
+  version: 1.68.2

snyk-operator-certified/bundle/metadata/annotations.yaml

@@ -10,4 +10,4 @@ annotations:
   operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
-  com.redhat.openshift.versions: "v4.6-v4.9"
+  com.redhat.openshift.versions: "v4.8"

snyk-operator-certified/config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: registry.connect.redhat.com/snyk/kubernetes-operator
-  newTag: 1.67.2
+  newTag: 1.68.2

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

@@ -15,7 +15,7 @@ metadata:
             "image": {
               "pullPolicy": "Always",
               "repository": "docker.io/snyk/kubernetes-monitor",
-              "tag": "1.67.2"
+              "tag": "1.68.2"
             },
             "integrationApi": "",
             "monitorSecrets": "snyk-monitor",
@@ -32,17 +32,18 @@ metadata:
           }
         }
       ]
+    "olm.skipRange": "<1.68.2"
     capabilities: Basic Install
     categories: Developer Tools, Security
     certified: "true"
-    containerImage: registry.connect.redhat.com/snyk/kubernetes-operator:1.67.2
+    containerImage: registry.connect.redhat.com/snyk/kubernetes-operator:1.68.2
     createdAt: "2020-08-28T15:20:21Z"
     description: A Kubernetes Operator for creating and managing Snyk controller instances.
     operators.operatorframework.io/builder: operator-sdk-v1.3.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/snyk/kubernetes-monitor
     support: Snyk Ltd.
-  name: snyk-operator.v1.67.2
+  name: snyk-operator.v1.68.2
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
@@ -159,4 +160,4 @@ spec:
   provider:
     name: Snyk Ltd.
     url: https://snyk.io
-  version: 1.67.2
+  version: 1.68.2

snyk-operator-certified/config/samples/charts_v1alpha1_snykmonitor.yaml

@@ -7,7 +7,7 @@ spec:
   image:
     pullPolicy: Always
     repository: docker.io/snyk/kubernetes-monitor
-    tag: 1.67.2
+    tag: 1.68.2
   integrationApi: ''
   monitorSecrets: snyk-monitor
   scope: Cluster

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

@@ -23,7 +23,7 @@ integrationApi: ""
 
 # The registry from which to pull the snyk-monitor image.
 image:
-  image: registry.connect.redhat.com/snyk/kubernetes-monitor:1.67.2
+  image: registry.connect.redhat.com/snyk/kubernetes-monitor:1.68.2
   pullPolicy: Always
 
 # If deploying in an air-gapped environment that can't pull from DockerHub, override the initContainer's image here for one that is accessible to your environment.