Merge pull request #23365 from jianzhangbjz/olm-23440

auto olm test case OCP-23440: the end user can use operator resources

hack/test-go.sh

@@ -33,7 +33,7 @@ os::cleanup::tmpdir
 
 # Internalize environment variables we consume and default if they're not set
 dry_run="${DRY_RUN:-}"
-test_timeout="${TIMEOUT:-120s}"
+test_timeout="${TIMEOUT:-240s}"
 detect_races="${DETECT_RACES:-true}"
 coverage_output_dir="${COVERAGE_OUTPUT_DIR:-}"
 coverage_spec="${COVERAGE_SPEC:--cover -covermode atomic}"

test/extended/operators/olm.go

@@ -2,13 +2,14 @@ package operators
 
 import (
 	"fmt"
-	"strings"
-
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
-
 	exutil "github.com/openshift/origin/test/extended/util"
+	"k8s.io/apimachinery/pkg/util/wait"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
+	"path/filepath"
+	"strings"
+	"time"
 )
 
 var _ = g.Describe("[Feature:Platform] OLM should", func() {
@@ -106,3 +107,65 @@ var _ = g.Describe("[Feature:Platform] OLM should", func() {
 	})
 
 })
+
+// This context will cover test case: OCP-23440, author: jiazha@redhat.com
+var _ = g.Describe("[Feature:Platform] an end user use OLM", func() {
+	defer g.GinkgoRecover()
+
+	var (
+		oc           = exutil.NewCLI("olm-23440", exutil.KubeConfigPath())
+		operatorWait = 120 * time.Second
+
+		buildPruningBaseDir = exutil.FixturePath("testdata", "olm")
+		operatorGroup       = filepath.Join(buildPruningBaseDir, "operatorgroup.yaml")
+		etcdSub             = filepath.Join(buildPruningBaseDir, "etcd-subscription.yaml")
+		etcdCluster         = filepath.Join(buildPruningBaseDir, "etcd-cluster.yaml")
+	)
+
+	files := []string{operatorGroup, etcdSub}
+	g.It("can subscribe to the etcd operator", func() {
+		g.By("Cluster-admin user subscribe the operator resource")
+		for _, v := range files {
+			configFile, err := oc.AsAdmin().Run("process").Args("--ignore-unknown-parameters=true", "-f", v, "-p", "NAME=test-operator", fmt.Sprintf("NAMESPACE=%s", oc.Namespace()), "SOURCENAME=community-operators", "SOURCENAMESPACE=openshift-marketplace").OutputToFile("config.json")
+			o.Expect(err).NotTo(o.HaveOccurred())
+			err = oc.AsAdmin().WithoutNamespace().Run("create").Args("-f", configFile).Execute()
+			o.Expect(err).NotTo(o.HaveOccurred())
+
+		}
+		err := wait.Poll(10*time.Second, operatorWait, func() (bool, error) {
+			output, err := oc.AsAdmin().Run("get").Args("-n", oc.Namespace(), "csv", "etcdoperator.v0.9.4", "-o=jsonpath={.status.phase}").Output()
+			if err != nil {
+				e2e.Failf("Failed to deploy etcdoperator.v0.9.4, error:%v", err)
+				return false, err
+			}
+			if strings.Contains(output, "Succeeded") {
+				return true, nil
+			}
+			return false, nil
+		})
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		g.By("Switch to common user to create the resources provided by the operator")
+		etcdClusterName := "example-etcd-cluster"
+		configFile, err := oc.Run("process").Args("-f", etcdCluster, "-p", fmt.Sprintf("NAME=%s", etcdClusterName), fmt.Sprintf("NAMESPACE=%s", oc.Namespace())).OutputToFile("config.json")
+		o.Expect(err).NotTo(o.HaveOccurred())
+		err = oc.Run("create").Args("-f", configFile).Execute()
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		err = wait.Poll(10*time.Second, operatorWait, func() (bool, error) {
+			output, err := oc.Run("get").Args("-n", oc.Namespace(), "etcdCluster", etcdClusterName, "-o=jsonpath={.status}").Output()
+			if err != nil {
+				e2e.Failf("Failed to get etcdCluster, error:%v", err)
+				return false, err
+			}
+			if strings.Contains(output, "phase:Running") && strings.Contains(output, "currentVersion:3.2.13") && strings.Contains(output, "size:3") {
+				return true, nil
+			}
+			return false, nil
+		})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		output, err := oc.Run("get").Args("pods", "-n", oc.Namespace()).Output()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		o.Expect(output).To(o.ContainSubstring(etcdClusterName))
+	})
+})

test/extended/testdata/olm/etcd-cluster.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Template
+metadata:
+  name: etcdCluster-template
+objects:
+- apiVersion: etcd.database.coreos.com/v1beta2
+  kind: EtcdCluster
+  metadata:
+    name: "${NAME}"
+    namespace: "${NAMESPACE}"
+  spec:
+    size: 3
+    version: 3.2.13
+parameters:
+- name: NAME
+- name: NAMESPACE

test/extended/testdata/olm/etcd-subscription.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Template
+metadata:
+  name: subscription-template
+objects:
+- apiVersion: operators.coreos.com/v1alpha1
+  kind: Subscription
+  metadata:
+    name: "${NAME}"
+    namespace: "${NAMESPACE}"
+  spec:
+    channel: singlenamespace-alpha
+    installPlanApproval: Automatic
+    name: etcd
+    source: "${SOURCENAME}"
+    sourceNamespace: "${SOURCENAMESPACE}"
+    startingCSV: etcdoperator.v0.9.4
+parameters:
+- name: NAME
+- name: NAMESPACE
+- name: SOURCENAME
+- name: SOURCENAMESPACE

test/extended/testdata/olm/operatorgroup.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Template
+metadata:
+  name: operatorgroup-template
+objects:
+- kind: OperatorGroup
+  apiVersion: operators.coreos.com/v1
+  metadata:
+    name: "${NAME}"
+    namespace: "${NAMESPACE}"
+  spec:
+    targetNamespaces:
+    - "${NAMESPACE}"
+
+parameters:
+- name: NAME
+- name: NAMESPACE
+