diff --git a/docs/modules/hive/examples/getting_started/getting_started.sh b/docs/modules/hive/examples/getting_started/getting_started.sh index 5f412fdc..501e5143 100755 --- a/docs/modules/hive/examples/getting_started/getting_started.sh +++ b/docs/modules/hive/examples/getting_started/getting_started.sh @@ -24,19 +24,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 hive-operator stackable-dev/hive-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 hive-operator oci://oci.stackable.tech/sdp-charts/hive-operator --version 0.0.0-dev # end::helm-install-operators[] echo "Install minio for S3" diff --git a/docs/modules/hive/examples/getting_started/getting_started.sh.j2 b/docs/modules/hive/examples/getting_started/getting_started.sh.j2 index 092944c7..ab2ddbe5 100755 --- a/docs/modules/hive/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/hive/examples/getting_started/getting_started.sh.j2 @@ -24,19 +24,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 hive-operator {{ helm.repo_name }}/hive-operator --version {{ versions.hive }} +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 hive-operator oci://{{ helm.repo_url }}/{{ helm.repo_name }}/hive-operator --version {{ versions.hive }} # end::helm-install-operators[] echo "Install minio for S3" diff --git a/docs/modules/hive/pages/getting_started/installation.adoc b/docs/modules/hive/pages/getting_started/installation.adoc index 118e74e6..6958f829 100644 --- a/docs/modules/hive/pages/getting_started/installation.adoc +++ b/docs/modules/hive/pages/getting_started/installation.adoc @@ -118,14 +118,9 @@ include::example$getting_started/install-operator-output.txt[] Run the following commands Helm to install the operators via Helm -Add the Stackable Helm repository: +NOTE: `helm repo` subcommands are not supported for OCI registries. The operators are installed directly, without adding the Helm Chart repository first. -[source,bash] ----- -include::example$getting_started/getting_started.sh[tag=helm-add-repo] ----- - -Then install the Stackable operators: +Install the Stackable operators: [source,bash] ---- diff --git a/docs/modules/hive/pages/usage-guide/derby-example.adoc b/docs/modules/hive/pages/usage-guide/derby-example.adoc index 7d7a51a8..57ac01cb 100644 --- a/docs/modules/hive/pages/usage-guide/derby-example.adoc +++ b/docs/modules/hive/pages/usage-guide/derby-example.adoc @@ -3,7 +3,7 @@ The version you need to specify is not only the version of Apache Hive which you want to roll out, but has to be amended with a Stackable version as shown. This Stackable version is the version of the underlying container image which is used to execute the processes. -For a list of available versions check the https://repo.stackable.tech/#browse/browse:docker:v2%2Fstackable%2Fhive%2Ftags[image registry]. +For a list of available versions check the 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]. It should generally be safe to simply use the latest image version that is available. .Create a single node Apache Hive Metastore cluster using Derby: diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 0dac15ec..231a9385 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 diff --git a/examples/simple-hive-cluster-postgres-s3.yaml b/examples/simple-hive-cluster-postgres-s3.yaml index 919284c3..e4817808 100644 --- a/examples/simple-hive-cluster-postgres-s3.yaml +++ b/examples/simple-hive-cluster-postgres-s3.yaml @@ -1,6 +1,5 @@ # helm install secret-operator \ -# secret-operator \ -# --repo https://repo.stackable.tech/repository/helm-stable +# oci://oci.stackable.tech/sdp-charts/secret-operator # helm install minio \ # minio \ # --repo https://charts.bitnami.com/bitnami \