chore: adjust Operator tests for OpenShift 4.6 and above

Version 4.6 introduced a breaking change to how Operators get deployed into the cluster and broke our integration tests.
The tests now also reference the new test cluster on OpenShift Dedicated.

Author: ivanstanev

.dockerignore

@@ -44,3 +44,7 @@ snyk-operator
 
 snyk-monitor-operator-source.yaml
 operator-sdk
+__pycache__
+opm
+.operator_version
+snyk-monitor-catalog-source.yaml

.gitignore

@@ -55,3 +55,7 @@ snyk-operator/helm-charts
 
 snyk-monitor-operator-source.yaml
 operator-sdk
+__pycache__
+opm
+.operator_version
+snyk-monitor-catalog-source.yaml

scripts/operator/create_operator_bundle_and_index_and_push.py

@@ -0,0 +1,26 @@
+#! /usr/bin/python3
+
+from os import chdir, environ, getcwd
+from subprocess import call
+from shutil import copy
+
+
+def createOperatorBundleAndIndexAndPushToDockerHub(operator_path: str, new_operator_tag: str, dockerhub_user: str, dockerhub_password: str) -> None:
+    current_dir = getcwd()
+    opm_copy_path = operator_path + "/" + "certified-operator/opm"
+    copy(current_dir + "/" + "opm", opm_copy_path)
+
+    call(["docker", "login", "--username=" + dockerhub_user,
+          "--password=" + dockerhub_password])
+
+    return_dir = current_dir
+    chdir(operator_path + "/" + "certified-operator")
+    print(operator_path + "/" + "certified-operator")
+    environ['VERSION'] = new_operator_tag
+    call(["make", "bundle-build"])
+    call(["docker", "push", "snyk/kubernetes-operator-bundle" + ":" + new_operator_tag])
+
+    call([opm_copy_path, "index", "add", "-c", "docker", "--bundles", "snyk/kubernetes-operator-bundle" +
+          ":" + new_operator_tag, "--tag", "snyk/kubernetes-operator-index" + ":" + new_operator_tag])
+    call(["docker", "push", "snyk/kubernetes-operator-index" + ":" + new_operator_tag])
+    chdir(return_dir)

scripts/operator/delete_operators_from_quay.py

@@ -0,0 +1,29 @@
+#! /usr/bin/python3
+
+from os import chmod, getcwd
+from os.path import isfile
+from requests import get
+from platform import system
+
+
+def downloadOperatorPackageManager() -> None:
+    cwd = getcwd()
+    operator_package_manager_path = cwd + "/" + "opm"
+    if isfile(operator_package_manager_path):
+        print("OPM is present locally")
+        return
+
+    current_sys = system()
+    if current_sys == "Darwin":
+        opm = get(
+            "https://github.com/operator-framework/operator-registry/releases/download/v1.16.1/darwin-amd64-opm")
+    else:
+        raise RuntimeError("Unsupported system " + current_sys)
+
+    with open(operator_package_manager_path, "wb") as f:
+        f.write(opm.content)
+    chmod(operator_package_manager_path, 0o744)
+
+
+if __name__ == "__main__":
+    downloadOperatorPackageManager()

scripts/operator/download_operator_package_manager.py

@@ -14,21 +14,24 @@
 - DOCKERHUB_PASSWORD
 """
 
-from os import environ
+from os import environ, remove
 from hashlib import sha1
 from datetime import datetime
+from shutil import rmtree
 from subprocess import call
-from get_quay_token import getQuayToken
+from download_operator_package_manager import downloadOperatorPackageManager
 from create_operator_and_push import createOperatorAndPushToDockerHub
 from package_operator_bundle import createOperatorFromTemplate
-from upload_operator_bundle_to_quay import uploadOperatorBundleToQuay
 from download_operator_sdk import downloadOperatorSdk
-
+from create_operator_bundle_and_index_and_push import createOperatorBundleAndIndexAndPushToDockerHub
 
 if __name__ == '__main__':
     random_digest = sha1(str(datetime.now()).encode("utf-8")).hexdigest()
     operator_version = "0.0.1-" + random_digest
 
+    with open(".operator_version", "w") as f:
+        f.write(operator_version)
+
     try:
         new_monitor_tag = environ['KUBERNETES_MONITOR_IMAGE_TAG']
     except:
@@ -39,17 +42,10 @@
         call(["docker", "build", "-t", monitor_name_and_tag, "."])
         call(["docker", "push", monitor_name_and_tag])
 
-    print("Authenticating to Quay")
-    quay_username = environ['QUAY_USERNAME']
-    quay_password = environ['QUAY_PASSWORD']
-    quay_token = getQuayToken(
-        "https://quay.io/cnr/api/v1/users/login",
-        quay_username,
-        quay_password
-    )
-
     print("Downloading Operator SDK")
     downloadOperatorSdk()
+    print("Downloading Operator Package Manager")
+    downloadOperatorPackageManager()
     call(["pip3", "install", "operator-courier==2.1.7"])
 
     print("Creating Operator image and pushing to DockerHub")
@@ -58,12 +54,17 @@
     createOperatorAndPushToDockerHub(
         operator_version, new_monitor_tag, dockerhub_user, dockerhub_password)
 
-    new_version = new_operator_tag = operator_version
+    new_operator_tag = operator_version
 
     print("Creating Operator bundle")
     operator_path = createOperatorFromTemplate(
         operator_version, new_operator_tag, new_monitor_tag)
-    print("Pushing Operator bundle to Quay")
-    uploadOperatorBundleToQuay(
-        operator_path, "snyk-runtime-local", "snyk-operator", operator_version, quay_token)
-    print("Operator version " + operator_version + " has been pushed to Quay")
+    print("Pushing Operator bundle")
+    createOperatorBundleAndIndexAndPushToDockerHub(
+        operator_path, new_operator_tag, dockerhub_user, dockerhub_password)
+    print("Operator version " + operator_version +
+          " has been pushed to Docker Hub")
+
+    # rmtree(operator_path)
+    # remove("operator-sdk")
+    # remove("opm")

scripts/operator/get_quay_token.py

@@ -3,7 +3,7 @@
 from tempfile import mkdtemp
 from os import mkdir
 from datetime import datetime
-from shutil import copy
+from shutil import copy, copytree
 from sys import argv
 
 
@@ -46,6 +46,13 @@ def createOperatorFromTemplate(new_version: str, new_operator_tag: str, new_moni
     with open(new_manifest_path, "w") as f:
         f.write(updated_manifest)
 
+    copytree("snyk-operator/certified-operator",
+             new_operator_dir + "/" + "certified-operator")
+    copy(new_csv_path, new_operator_dir + "/" + "certified-operator/bundle/manifests" +
+         "/" + "snyk-operator.v" + new_version + ".clusterserviceversion.yaml")
+    copy(new_crd_path, new_operator_dir + "/" + "certified-operator/bundle/manifests" +
+         "/" + "snykmonitors.charts.helm.k8s.io.crd.yaml")
+
     return new_operator_dir
 
 

scripts/operator/main.py

@@ -10,8 +10,6 @@
 # - See test/README-OPENSHIFT4.md for instructions (skip if already done).
 #
 # The following environment variables:
-# - QUAY_USERNAME (search in 1Password: xnz2hv2h3bdwriove2zlbnlwhq)
-# - QUAY_PASSWORD (search in 1Password: xnz2hv2h3bdwriove2zlbnlwhq)
 # - DOCKERHUB_USER (search in 1Password: mrvhrhni3jdj3mjzlf3u3zfhgm)
 # - DOCKERHUB_PASSWORD (search in 1Password: mrvhrhni3jdj3mjzlf3u3zfhgm)
 # - OPENSHIFT4_USER (crc console --credentials)
@@ -23,6 +21,8 @@
 #   Choose a published tag from https://github.com/snyk/kubernetes-monitor/releases.
 #
 
+set -eo pipefail
+
 function validateEnvVar {
   var_name="$1"
   var_value="$2"
@@ -32,18 +32,13 @@ function validateEnvVar {
   fi
 }
 
-validateEnvVar QUAY_USERNAME "$QUAY_USERNAME"
-validateEnvVar QUAY_PASSWORD "$QUAY_PASSWORD"
 validateEnvVar DOCKERHUB_USER "$DOCKERHUB_USER"
 validateEnvVar DOCKERHUB_PASSWORD "$DOCKERHUB_PASSWORD"
 validateEnvVar OPENSHIFT4_USER "$OPENSHIFT4_USER"
 validateEnvVar OPENSHIFT4_PASSWORD "$OPENSHIFT4_PASSWORD"
 validateEnvVar OPENSHIFT4_CLUSTER_URL "$OPENSHIFT4_CLUSTER_URL"
 
 if [ "${CI}" != "true" ]; then
-  # Ensure any left-over Operators don't interfere with this test run
-  python3 scripts/operator/delete_operators_from_quay.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}"
-  
   if [ "$KUBERNETES_MONITOR_IMAGE_TAG" == "" ]; then
     RED_COLOR='\033[0;31m'
     NO_COLOR='\033[0m'
@@ -58,10 +53,14 @@ if [ "${CI}" != "true" ]; then
     sleep 10
   fi
 
-  # no-op if already started:
-  crc start
-  
-  oc login -u "${OPENSHIFT4_USER}" -p "${OPENSHIFT4_PASSWORD}" "${OPENSHIFT4_CLUSTER_URL}" --insecure-skip-tls-verify=true
+  # Check if we're testing against a local OpenShift cluster
+  if [ "${OPENSHIFT4_CLUSTER_URL}" == "https://api.crc.testing:6443" ]; then
+    # no-op if already started:
+    crc start
+    oc login -u "${OPENSHIFT4_USER}" -p "${OPENSHIFT4_PASSWORD}" "${OPENSHIFT4_CLUSTER_URL}" --insecure-skip-tls-verify=true
+  else
+    oc login --token="${OPENSHIFT4_PASSWORD}" --server="${OPENSHIFT4_CLUSTER_URL}"
+  fi 
 
   python3 scripts/operator/main.py
 fi