Update to spark 1.1.0 and use OLM subscription for install (#202)

Signed-off-by: Landon LaSmith <LLaSmith@redhat.com>
opendatahub-io · Oct 27, 2020 · 9d4b574 · 9d4b574
1 parent 3eb9f51
commit 9d4b574
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 209 deletions.
diff --git a/kfdef/kfctl_openshift.yaml b/kfdef/kfctl_openshift.yaml
@@ -63,12 +63,7 @@ spec:
       repoRef:
         name: manifests
         path: radanalyticsio/spark/cluster
-    name: radanalyticsio-cluster
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: radanalyticsio/spark/operator
-    name: radanalyticsio-spark-operator
+    name: radanalyticsio-spark-cluster
   - kustomizeConfig:
       repoRef:
         name: manifests

diff --git a/kfdef/kfctl_openshift_distributed_training.yaml b/kfdef/kfctl_openshift_distributed_training.yaml
@@ -63,12 +63,7 @@ spec:
       repoRef:
         name: manifests
         path: radanalyticsio/spark/cluster
-    name: radanalyticsio-cluster
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: radanalyticsio/spark/operator
-    name: radanalyticsio-spark-operator
+    name: radanalyticsio-spark-cluster
   - kustomizeConfig:
       repoRef:
         name: manifests

diff --git a/radanalyticsio/README.md b/radanalyticsio/README.md
@@ -1,8 +1,6 @@
 # Radanalytics
 
-Radanalytics comes with 1 component:
-
-1. [spark operator](#spark-operator)
+[Radanalytics](https://radanalytics.io/) contains one component, a [spark operator](#spark-operator), that deploy [Apache Spark](https://spark.apache.org) clusters for large-scale data processing.
 
 ## Spark Operator
 
@@ -22,12 +20,7 @@ Spark Operator does not provide any parameters.
       repoRef:
         name: manifests
         path: radanalyticsio/spark/cluster
-    name: radanalyticsio-cluster
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: radanalyticsio/spark/operator
-    name: radanalyticsio-spark-operator
+    name: radanalyticsio-spark-cluster
 ```
 
 

diff --git a/radanalyticsio/spark/cluster/base/clusterrole.yaml b/radanalyticsio/spark/cluster/base/clusterrole.yaml
diff --git a/radanalyticsio/spark/cluster/base/clusterrolebinding.yaml b/radanalyticsio/spark/cluster/base/clusterrolebinding.yaml
diff --git a/radanalyticsio/spark/cluster/base/kustomization.yaml b/radanalyticsio/spark/cluster/base/kustomization.yaml
@@ -1,22 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-- sparkapplications.radanalytics.io.crd.yaml
-- sparkclusters.radanalytics.io.crd.yaml
-- sparkhistoryservers.radanalytics.io.crd.yaml
-- service-account.yaml
-- clusterrole.yaml
-- clusterrolebinding.yaml
 namespace: opendatahub
-
-vars:
-- name: namespace
-  objref:
-    kind: ServiceAccount
-    name: spark-operator
-    apiVersion: v1
-  fieldref:
-    fieldpath: metadata.namespace
-
-configurations:
-- params.yaml
+resources:
+- subscription.yaml
diff --git a/radanalyticsio/spark/cluster/base/service-account.yaml b/radanalyticsio/spark/cluster/base/service-account.yaml
diff --git a/radanalyticsio/spark/cluster/base/sparkapplications.radanalytics.io.crd.yaml b/radanalyticsio/spark/cluster/base/sparkapplications.radanalytics.io.crd.yaml
diff --git a/radanalyticsio/spark/cluster/base/sparkclusters.radanalytics.io.crd.yaml b/radanalyticsio/spark/cluster/base/sparkclusters.radanalytics.io.crd.yaml
diff --git a/radanalyticsio/spark/cluster/base/sparkhistoryservers.radanalytics.io.crd.yaml b/radanalyticsio/spark/cluster/base/sparkhistoryservers.radanalytics.io.crd.yaml
diff --git a/radanalyticsio/spark/cluster/base/subscription.yaml b/radanalyticsio/spark/cluster/base/subscription.yaml
@@ -0,0 +1,12 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: radanalytics-spark
+  namespace: opendatahub
+spec:
+  channel: alpha
+  installPlanApproval: Automatic
+  name: radanalytics-spark
+  source: community-operators
+  sourceNamespace: openshift-marketplace
+  startingCSV: sparkoperator.v1.1.0
diff --git a/radanalyticsio/spark/operator/base/deployment.yaml b/radanalyticsio/spark/operator/base/deployment.yaml
diff --git a/radanalyticsio/spark/operator/base/kustomization.yaml b/radanalyticsio/spark/operator/base/kustomization.yaml
diff --git a/tests/basictests/radanalytics.sh b/tests/basictests/radanalytics.sh
@@ -15,7 +15,7 @@ function verify_spark_operator_install() {
     header "Testing Radanalytics Spark Operator installation"
     os::cmd::expect_success "oc project ${ODHPROJECT}"
     os::cmd::expect_success_and_text "oc get deployment spark-operator" "spark-operator"
-    runningpods=($(oc get pods -l app.kubernetes.io/name=spark-operator --field-selector="status.phase=Running" -o jsonpath="{$.items[*].metadata.name}"))
+    runningpods=($(oc get pods -l app.kubernetes.io/name=radanalytics-spark-operator --field-selector="status.phase=Running" -o jsonpath="{$.items[*].metadata.name}"))
     os::cmd::expect_success_and_text "echo ${#runningpods[@]}" "1"
 }
 

diff --git a/tests/setup/kfctl_openshift.yaml b/tests/setup/kfctl_openshift.yaml
@@ -50,12 +50,7 @@ spec:
       repoRef:
         name: manifests
         path: radanalyticsio/spark/cluster
-    name: radanalyticsio-cluster
-  - kustomizeConfig:
-      repoRef:
-        name: manifests
-        path: radanalyticsio/spark/operator
-    name: radanalyticsio-spark-operator
+    name: radanalyticsio-spark-cluster
   - kustomizeConfig:
       repoRef:
         name: manifests