[DPE-2741] Prepare stable release (#82)

canonical · Oct 13, 2023 · 095cd7c · 095cd7c
1 parent 2cf7b02
commit 095cd7c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 28 deletions.
diff --git a/docs/how-to/h-deploy-spark-history.md b/docs/how-to/h-deploy-spark-history.md
@@ -56,7 +56,7 @@ s3.put_object(Bucket="history-server", Key=("spark-events/"))
 * *Deploy the Spark History Server component*
 
 ```bash
-juju deploy spark-history-server-k8s -n1 --channel 3.4/edge
+juju deploy spark-history-server-k8s -n1 --channel 3.4/stable
 ```
 
 * *Deploy and configure a [s3-integrator](https://charmhub.io/s3-integrator) charm*
@@ -83,7 +83,7 @@ spark  micro       microk8s/localhost  2.9.43   unsupported  19:12:46+02:00
 
 App                       Version  Status  Scale  Charm                     Channel  Rev  Address         Exposed  Message
 s3-integrator                      active      1  s3-integrator             edge      12  10.152.183.253  no       
-spark-history-server-k8s           active      1  spark-history-server-k8s             0  10.152.183.100  no       
+spark-history-server-k8s           active      1  spark-history-server-k8s  stable     0  10.152.183.100  no       
 
 Unit                         Workload  Agent  Address      Ports  Message
 s3-integrator/0*             active    idle   10.1.99.136         

diff --git a/docs/how-to/h-run-on-k8s-pod.md b/docs/how-to/h-run-on-k8s-pod.md
@@ -17,7 +17,7 @@ metadata:
 spec:
   containers:
   - name: spark-client
-    image: ghcr.io/canonical/charmed-spark:3.4.1-22.04_edge
+    image: ghcr.io/canonical/charmed-spark:3.4.1-22.04_stable
     command: ["/bin/pebble", "run", "--hold"]
   serviceAccountName: spark
   hostNetwork: true

diff --git a/docs/how-to/h-spark-streaming.md b/docs/how-to/h-spark-streaming.md
@@ -57,7 +57,7 @@ metadata:
   name: testpod
 spec:
   containers:
-  - image: ghcr.io/canonical/charmed-spark:3.4.1-22.04_edge
+  - image: ghcr.io/canonical/charmed-spark:3.4.1-22.04_stable
     name: spark
     ports:
     - containerPort: 18080

diff --git a/docs/tutorial/t-setup-environment.md b/docs/tutorial/t-setup-environment.md
@@ -54,7 +54,7 @@ The MicroK8s cluster is now ready to be used.
 In order to install the spark-client snap on your local environment or on an edge node of a cluster, simply issue the following command:
 
 ```bash
-sudo snap install spark-client --edge
+sudo snap install spark-client --stable
 ```
 
 This will install all the spark binaries along side with the `spark-client` utilities provided in 

diff --git a/snap/local/etc/spark8t/spark-defaults.conf b/snap/local/etc/spark8t/spark-defaults.conf
@@ -1 +1 @@
-spark.kubernetes.container.image=ghcr.io/canonical/charmed-spark:3.4-22.04_beta
+spark.kubernetes.container.image=ghcr.io/canonical/charmed-spark:3.4-22.04_stable
diff --git a/tests/integration/ie-tests.sh b/tests/integration/ie-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-readonly SPARK_IMAGE='ghcr.io/canonical/charmed-spark:3.4-22.04_beta'
+readonly SPARK_IMAGE='ghcr.io/canonical/charmed-spark:3.4-22.04_stable'
 
 setup_tests() {
   sudo snap connect spark-client:dot-kube-config
@@ -210,9 +210,9 @@ setup_test_pod() {
 
   MY_KUBE_CONFIG=$(cat /home/${USER}/.kube/config)
 
-  kubectl exec testpod -- /bin/bash -c 'mkdir /home/spark/.kube'
-  kubectl exec testpod -- env KCONFIG="$MY_KUBE_CONFIG" /bin/bash -c 'echo "$KCONFIG" > /home/spark/.kube/config'
-  kubectl exec testpod -- /bin/bash -c 'cat /home/spark/.kube/config'
+  kubectl exec testpod -- /bin/bash -c 'mkdir -p ~/.kube'
+  kubectl exec testpod -- env KCONFIG="$MY_KUBE_CONFIG" /bin/bash -c 'echo "$KCONFIG" > ~/.kube/config'
+  kubectl exec testpod -- /bin/bash -c 'cat ~/.kube/config'
 }
 
 teardown_test_pod() {

diff --git a/tests/integration/resources/testpod.yaml b/tests/integration/resources/testpod.yaml
@@ -4,24 +4,7 @@ metadata:
   name: testpod
 spec:
   containers:
-  - image: ghcr.io/canonical/charmed-spark:3.4-22.04_beta
+  - image: ghcr.io/canonical/charmed-spark:3.4-22.04_stable
     name: spark
     ports:
     - containerPort: 18080
-    env:
-      - name: SPARK_CONFS
-        value: /etc/spark8t/conf
-      - name: SPARK_HOME
-        value: "/opt/spark"
-      - name: JAVA_HOME
-        value: "/usr/lib/jvm/java-11-openjdk-amd64"
-      - name: PYTHONPATH
-        value: "/opt/spark/python:/opt/spark8t/python/dist:/usr/lib/python3/dist-packages"
-      - name: PATH
-        value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/spark:/opt/spark/bin:/opt/spark/python/bin:/opt/spark-client/python/bin
-      - name: HOME
-        value: /home/spark
-      - name: KUBECONFIG
-        value: /home/spark/.kube/config
-      - name: SPARK_USER_DATA
-        value: /home/spark