From ef086075bd7e9ad1c1fe15ec7ea4d9b0d2a7ef6b Mon Sep 17 00:00:00 2001 From: Guillaume Moutier Date: Mon, 11 Jul 2022 09:32:33 -0400 Subject: [PATCH] pre-repository transfer adjustments --- README.adoc | 2 +- spark-history-server/spark-hs-deployment.yaml | 9 +-------- test/spark_app_shakespeare_2.4.6.yaml | 2 +- test/spark_app_shakespeare_3.0.1.yaml | 2 +- test/spark_app_shakespeare_3.3.0.history_server.yaml | 2 +- test/spark_app_shakespeare_3.3.0.yaml | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/README.adoc b/README.adoc index 2ac8439..a6b3e48 100644 --- a/README.adoc +++ b/README.adoc @@ -16,7 +16,7 @@ Instructions and tools for deploying and using the https://github.com/GoogleClou We include in this project custom Spark images with the Hadoop S3a connector to connect to S3-based object storage. Those images are based on https://catalog.redhat.com/software/containers/ubi8/openjdk-8/5dd6a48dbed8bd164a09589a[ubi8/openjdk-8], and are updated accordingly. -Pre-built images can be found here, https://quay.io/repository/guimou/spark-odh and https://quay.io/repository/guimou/pyspark-odh, but you can also choose to build your own. +Pre-built images can be found here, https://quay.io/repository/opendatahub-contrib/spark and https://quay.io/repository/opendatahub-contrib/pyspark, but you can also choose to build your own. Available images: diff --git a/spark-history-server/spark-hs-deployment.yaml b/spark-history-server/spark-hs-deployment.yaml index 401e4b6..28ecc59 100644 --- a/spark-history-server/spark-hs-deployment.yaml +++ b/spark-history-server/spark-hs-deployment.yaml @@ -1,5 +1,4 @@ ### Adapted from Helm Chart: https://artifacthub.io/packages/helm/spot/spark-history-server -# Source: spark-history-server/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount metadata: @@ -8,7 +7,6 @@ metadata: app.kubernetes.io/name: spark-history-server app.kubernetes.io/instance: spark-history-server --- -# Source: spark-history-server/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -16,13 +14,11 @@ metadata: labels: app.kubernetes.io/name: spark-history-server app.kubernetes.io/instance: spark-history-server - app.kubernetes.io/managed-by: Helm rules: - apiGroups: [""] resources: ["deployments", "pods"] verbs: ["*"] --- -# Source: spark-history-server/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: @@ -36,14 +32,12 @@ roleRef: name: spark-history-server-cr apiGroup: rbac.authorization.k8s.io --- -# Source: spark-history-server/templates/service.yaml apiVersion: v1 kind: Service metadata: name: spark-history-server labels: app.kubernetes.io/name: spark-history-server - helm.sh/chart: spark-history-server-1.5.0 app.kubernetes.io/instance: spark-history-server spec: type: ClusterIP @@ -82,7 +76,6 @@ metadata: name: spark-history-server labels: app.kubernetes.io/name: spark-history-server - helm.sh/chart: spark-history-server-1.5.0 app.kubernetes.io/instance: spark-history-server spec: replicas: 1 @@ -99,7 +92,7 @@ spec: serviceAccountName: spark-history-server containers: - name: spark-history-server - image: "quay.io/guimou/spark-odh:s3.0.1-h3.3.0_v0.0.2" + image: "quay.io/opendatahub-contrib/spark:s3.3.0-h3.3.3_latest" imagePullPolicy: IfNotPresent serviceAccount: 'spark-operator-spark' env: diff --git a/test/spark_app_shakespeare_2.4.6.yaml b/test/spark_app_shakespeare_2.4.6.yaml index 9d99000..7c37001 100644 --- a/test/spark_app_shakespeare_2.4.6.yaml +++ b/test/spark_app_shakespeare_2.4.6.yaml @@ -10,7 +10,7 @@ spec: "spark.metrics.conf.*.source.jvm.class": "org.apache.spark.metrics.source.JvmSource" "spark.metrics.appStatusSource.enabled": "true" mainApplicationFile: 'local:///home/wordcount.py' - image: "quay.io/guimou/pyspark-odh:s2.4.6-h3.3.0_latest" + image: "quay.io/opendatahub-contrib/pyspark:s2.4.6-h3.3.0_latest" imagePullPolicy: Always volumes: - name: wordcount diff --git a/test/spark_app_shakespeare_3.0.1.yaml b/test/spark_app_shakespeare_3.0.1.yaml index 8d1cc8c..fd23c26 100644 --- a/test/spark_app_shakespeare_3.0.1.yaml +++ b/test/spark_app_shakespeare_3.0.1.yaml @@ -10,7 +10,7 @@ spec: "spark.metrics.conf.*.source.jvm.class": "org.apache.spark.metrics.source.JvmSource" "spark.metrics.appStatusSource.enabled": "true" mainApplicationFile: 'local:///home/wordcount.py' - image: "quay.io/guimou/pyspark-odh:s3.0.1-h3.3.0_latest" + image: "quay.io/opendatahub-contrib/pyspark:s3.0.1-h3.3.0_latest" imagePullPolicy: Always volumes: - name: wordcount diff --git a/test/spark_app_shakespeare_3.3.0.history_server.yaml b/test/spark_app_shakespeare_3.3.0.history_server.yaml index edc1ec5..aaaf814 100644 --- a/test/spark_app_shakespeare_3.3.0.history_server.yaml +++ b/test/spark_app_shakespeare_3.3.0.history_server.yaml @@ -17,7 +17,7 @@ spec: "spark.hadoop.fs.s3a.bucket.YOUR_BUCKET.path.style.access": "true" "spark.hadoop.fs.s3a.bucket.YOUR_BUCKET.connection.ssl.enabled": "false" mainApplicationFile: 'local:///home/wordcount.py' - image: "quay.io/guimou/pyspark-odh:s3.3.0-h3.3.3_latest" + image: "quay.io/opendatahub-contrib/pyspark:s3.3.0-h3.3.3_latest" imagePullPolicy: Always volumes: - name: wordcount diff --git a/test/spark_app_shakespeare_3.3.0.yaml b/test/spark_app_shakespeare_3.3.0.yaml index 11068be..7befd4b 100644 --- a/test/spark_app_shakespeare_3.3.0.yaml +++ b/test/spark_app_shakespeare_3.3.0.yaml @@ -10,7 +10,7 @@ spec: "spark.metrics.conf.*.source.jvm.class": "org.apache.spark.metrics.source.JvmSource" "spark.metrics.appStatusSource.enabled": "true" mainApplicationFile: 'local:///home/wordcount.py' - image: "quay.io/guimou/pyspark-odh:s3.3.0-h3.3.3_latest" + image: "quay.io/opendatahub-contrib/pyspark:s3.3.0-h3.3.3_latest" imagePullPolicy: Always volumes: - name: wordcount