This is an automated email from the ASF dual-hosted git repository.
tloubrieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/master by this push:
new 49f5c3c upgrade helm template and README for latest nginx-ingress and
python 3.8 and spark 3.1.1 (#143)
49f5c3c is described below
commit 49f5c3c32993d1c1348f3a6457c7b13ea1b79f97
Author: thomas loubrieu <[email protected]>
AuthorDate: Tue Nov 16 09:52:37 2021 -0800
upgrade helm template and README for latest nginx-ingress and python 3.8
and spark 3.1.1 (#143)
Co-authored-by: Thomas Loubrieu <[email protected]>
---
docker/nexus-webapp/Dockerfile | 4 ++--
helm/README.md | 2 +-
helm/templates/ingress.yml | 1 +
helm/templates/webapp.yml | 10 +++++-----
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/docker/nexus-webapp/Dockerfile b/docker/nexus-webapp/Dockerfile
index 68f7d87..1bf0c21 100644
--- a/docker/nexus-webapp/Dockerfile
+++ b/docker/nexus-webapp/Dockerfile
@@ -30,8 +30,8 @@ ENV \
PATH="$CONDA_DIR/bin:$PATH" \
PYTHONDONTWRITEBYTECODE=1 \
SPARK_HOME=/opt/spark \
- PYSPARK_DRIVER_PYTHON=/opt/conda/lib/python3.8 \
- PYSPARK_PYTHON=/opt/conda/lib/python3.8 \
+ PYSPARK_DRIVER_PYTHON=/opt/conda/bin/python3.8 \
+ PYSPARK_PYTHON=/opt/conda/bin/python3.8 \
LD_LIBRARY_PATH=/usr/lib
RUN apk add --update --no-cache \
diff --git a/helm/README.md b/helm/README.md
index 4a50aab..33d8cd0 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -48,7 +48,7 @@ NEXUS needs the [Spark
Operator](https://github.com/helm/charts/tree/master/incu
Follow their instructions to install the Helm chart, or simply run:
$ kubectl create namespace spark-operator
- $ helm repo add incubator
http://storage.googleapis.com/kubernetes-charts-incubator
+ $ helm repo add incubator https://charts.helm.sh/incubator
$ helm install incubator/sparkoperator --generate-name
--namespace=spark-operator
#### Persistent Volume Provisioner
diff --git a/helm/templates/ingress.yml b/helm/templates/ingress.yml
index c4ccd80..cbc72f1 100644
--- a/helm/templates/ingress.yml
+++ b/helm/templates/ingress.yml
@@ -3,6 +3,7 @@ kind: Ingress
metadata:
name: nexus-webapp
annotations:
+ kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/rewrite-target: /$1
nginx.ingress.kubernetes.io/proxy-read-timeout: "180"
nginx.ingress.kubernetes.io/proxy-send-timeout: "180"
diff --git a/helm/templates/webapp.yml b/helm/templates/webapp.yml
index d14f877..e82c225 100644
--- a/helm/templates/webapp.yml
+++ b/helm/templates/webapp.yml
@@ -6,7 +6,7 @@ metadata:
name: nexus-webapp
spec:
type: Python
- pythonVersion: "2"
+ pythonVersion: "3"
mode: cluster
image: {{ .Values.webapp.distributed.image }}
imagePullPolicy: Always
@@ -16,7 +16,7 @@ spec:
- --cassandra-username={{ include "nexus.credentials.cassandra.username" .
}}
- --cassandra-password={{ include "nexus.credentials.cassandra.password" .
}}
- --solr-host={{ include "nexus.urls.solr" . }}
- sparkVersion: "2.4.4"
+ sparkVersion: "3.1.1"
restartPolicy:
type: OnFailure
onFailureRetries: 10
@@ -26,13 +26,13 @@ spec:
driver:
{{ .Values.webapp.distributed.driver | toYaml | indent 4 }}
labels:
- version: 2.4.4
+ version: 3.1.1
serviceAccount: spark-serviceaccount
executor:
{{ .Values.webapp.distributed.executor| toYaml | indent 4 }}
labels:
- version: 2.4.4
-
+ version: 3.1.1
+
---
apiVersion: v1
