diff --git a/docs/modules/spark-k8s/examples/getting_started/getting_started.sh b/docs/modules/spark-k8s/examples/getting_started/getting_started.sh index 94153976..c51c3fd8 100755 --- a/docs/modules/spark-k8s/examples/getting_started/getting_started.sh +++ b/docs/modules/spark-k8s/examples/getting_started/getting_started.sh @@ -21,19 +21,12 @@ cd "$(dirname "$0")" case "$1" in "helm") -echo "Adding 'stackable-dev' Helm Chart repository" -# tag::helm-add-repo[] -helm repo add stackable-dev https://repo.stackable.tech/repository/helm-dev/ -# end::helm-add-repo[] -echo "Updating Helm repo" -helm repo update - echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-dev/commons-operator --version 0.0.0-dev -helm install --wait secret-operator stackable-dev/secret-operator --version 0.0.0-dev -helm install --wait listener-operator stackable-dev/listener-operator --version 0.0.0-dev -helm install --wait spark-k8s-operator stackable-dev/spark-k8s-operator --version 0.0.0-dev +helm install --wait commons-operator oci://oci.stackable.tech/sdp-charts/commons-operator --version 0.0.0-dev +helm install --wait secret-operator oci://oci.stackable.tech/sdp-charts/secret-operator --version 0.0.0-dev +helm install --wait listener-operator oci://oci.stackable.tech/sdp-charts/listener-operator --version 0.0.0-dev +helm install --wait spark-k8s-operator oci://oci.stackable.tech/sdp-charts/spark-k8s-operator --version 0.0.0-dev # end::helm-install-operators[] ;; "stackablectl") diff --git a/docs/modules/spark-k8s/examples/getting_started/getting_started.sh.j2 b/docs/modules/spark-k8s/examples/getting_started/getting_started.sh.j2 index e7d0e0cb..7d9fde04 100755 --- a/docs/modules/spark-k8s/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/spark-k8s/examples/getting_started/getting_started.sh.j2 @@ -21,19 +21,12 @@ cd "$(dirname "$0")" case "$1" in "helm") -echo "Adding '{{ helm.repo_name }}' Helm Chart repository" -# tag::helm-add-repo[] -helm repo add {{ helm.repo_name }} {{ helm.repo_url }} -# end::helm-add-repo[] -echo "Updating Helm repo" -helm repo update - echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator {{ helm.repo_name }}/commons-operator --version {{ versions.commons }} -helm install --wait secret-operator {{ helm.repo_name }}/secret-operator --version {{ versions.secret }} -helm install --wait listener-operator {{ helm.repo_name }}/listener-operator --version {{ versions.listener }} -helm install --wait spark-k8s-operator {{ helm.repo_name }}/spark-k8s-operator --version {{ versions.spark }} +helm install --wait commons-operator oci://{{ helm.repo_url }}/{{ helm.repo_name }}/commons-operator --version {{ versions.commons }} +helm install --wait secret-operator oci://{{ helm.repo_url }}/{{ helm.repo_name }}/secret-operator --version {{ versions.secret }} +helm install --wait listener-operator oci://{{ helm.repo_url }}/{{ helm.repo_name }}/listener-operator --version {{ versions.listener }} +helm install --wait spark-k8s-operator oci://{{ helm.repo_url }}/{{ helm.repo_name }}/spark-k8s-operator --version {{ versions.spark }} # end::helm-install-operators[] ;; "stackablectl") diff --git a/docs/modules/spark-k8s/pages/getting_started/first_steps.adoc b/docs/modules/spark-k8s/pages/getting_started/first_steps.adoc index 4fe84603..0a94545b 100644 --- a/docs/modules/spark-k8s/pages/getting_started/first_steps.adoc +++ b/docs/modules/spark-k8s/pages/getting_started/first_steps.adoc @@ -23,7 +23,7 @@ Where: * `metadata.name` contains the name of the SparkApplication * `spec.version`: SparkApplication version (1.0). This can be freely set by the users and is added by the operator as label to all workload resources created by the application. -* `spec.sparkImage`: the image used by the job, driver and executor pods. This can be a custom image built by the user or an official Stackable image. Available official images are listed in the Stackable https://repo.stackable.tech/#browse/browse:docker:v2%2Fstackable%spark-k8s%2Ftags[image registry]. +* `spec.sparkImage`: the image used by the job, driver and executor pods. This can be a custom image built by the user or an official Stackable image. Available official images are stored in the Stackable https://oci.stackable.tech/[image registry,window=_blank]. Information on how to browse the registry can be found xref:contributor:project-overview.adoc#docker-images[here,window=_blank]. * `spec.mode`: only `cluster` is currently supported * `spec.mainApplicationFile`: the artifact (Java, Scala or Python) that forms the basis of the Spark job. This path is relative to the image, so in this case an example python script (that calculates the value of pi) is running: it is bundled with the Spark code and therefore already present in the job image diff --git a/docs/modules/spark-k8s/pages/getting_started/installation.adoc b/docs/modules/spark-k8s/pages/getting_started/installation.adoc index f95893c8..b781c22b 100644 --- a/docs/modules/spark-k8s/pages/getting_started/installation.adoc +++ b/docs/modules/spark-k8s/pages/getting_started/installation.adoc @@ -51,11 +51,7 @@ For example, you can use the `--cluster kind` flag to create a Kubernetes cluste Helm:: + -- -Add the Stackable Helm repository: -[source,bash] ----- -include::example$getting_started/getting_started.sh[tag=helm-add-repo] ----- +NOTE: `helm repo` subcommands are not supported for OCI registries. The operators are installed directly, without adding the Helm Chart repository first. Install the Stackable Operators: [source,bash] diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index bb53dbf2..c7d50fdf 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -1,7 +1,7 @@ --- helm: - repo_name: stackable-dev - repo_url: https://repo.stackable.tech/repository/helm-dev/ + repo_name: sdp-charts + repo_url: oci.stackable.tech versions: commons: 0.0.0-dev secret: 0.0.0-dev