Merge pull request #1070 from pohly/operator-update

operator update

Author: pohly

conf.json

@@ -20,6 +20,8 @@
         "sphinx_copybutton"
     ],
     "linkcheck_ignore": [
+        "https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line",
+        "https://help.github.com/articles/using-pull-requests/",
         "https://intel.github.io/pmem-csi/1.0/",
         ".*cloudnative-k8sci.southcentralus.cloudapp.azure.com.*"
     ],

deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml

@@ -1,11 +1,10 @@
-# This file was generated by controller-gen v0.7.0 via 'make operator-generate-crd'
-
+# This file was generated by controller-gen v0.8.0 via 'make operator-generate-crd'
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: pmemcsideployments.pmem-csi.intel.com
 spec:

operator/operator.make

@@ -1,5 +1,7 @@
+# https://github.com/operator-framework/operator-sdk/releases
 OPERATOR_SDK_VERSION=1.17.0
-CONTROLLER_GEN_VERSION=v0.7.0
+# https://github.com/kubernetes-sigs/controller-tools/releases
+CONTROLLER_GEN_VERSION=v0.8.0
 CONTROLLER_GEN=_work/bin/controller-gen-$(CONTROLLER_GEN_VERSION)
 
 # download operator-sdk binary

test/e2e/deploy/deploy.go

@@ -1012,7 +1012,15 @@ func findOperatorOnce(c *Cluster) (*Deployment, error) {
 	return deployment, nil
 }
 
+// The order matters here: the deployments listed first will also run first,
+// and somehow that helps OLM. When it was run at the end, there were OLM
+// errors ("operatorhubio-catalog-lbdrz 0/1 CrashLoopBackOff") that did not
+// occur locally or when running the tests on a "fresh" CI cluster.
 var allDeployments = []string{
+	"olm", // operator installed by OLM
+	"olm-lvm-production",
+	"olm-direct-production",
+
 	"lvm-production",
 	"direct-production",
 	"operator",
@@ -1021,9 +1029,6 @@ var allDeployments = []string{
 	// Uses kube-system, to ensure that deployment in a namespace also works,
 	// and *no* controller.
 	"operator-direct-production",
-	"olm", // operator installed by OLM
-	"olm-lvm-production",
-	"olm-direct-production",
 }
 var deploymentRE = regexp.MustCompile(`^(operator|olm)?-?(\w*)?-?(testing|production)?-?([0-9\.]*)$`)
 

test/start-stop-olm.sh

@@ -16,6 +16,9 @@ CLUSTER=${CLUSTER:-pmem-govm}
 CLUSTER_DIR="${CLUSTER_DIRECTORY:-${REPO_DIR}/_work/${CLUSTER}}"
 SSH="${CLUSTER_DIR}/ssh.0"
 KUBECTL="${SSH} kubectl" # Always use the kubectl installed in the cluster.
+
+# https://github.com/operator-framework/operator-lifecycle-manager/releases
+# Not the latest because of https://github.com/operator-framework/operator-sdk/issues/5410
 OLM_VERSION=v0.18.3
 
 function usage() {