diff --git a/demos/demos-v2.yaml b/demos/demos-v2.yaml index 59da3ad8..1b957867 100644 --- a/demos/demos-v2.yaml +++ b/demos/demos-v2.yaml @@ -16,12 +16,12 @@ demos: # projects ################################ - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/projects/airflow.yaml - - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/projects/minio.yaml + - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/projects/garage.yaml ################################ # prerequisites ################################ - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/applications/airflow-postgres.yaml - - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/applications/minio.yaml + - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/applications/garage.yaml ################################ # products ################################ diff --git a/docs/modules/demos/pages/argo-cd-git-ops.adoc b/docs/modules/demos/pages/argo-cd-git-ops.adoc index 5f3610bc..71fec5a6 100644 --- a/docs/modules/demos/pages/argo-cd-git-ops.adoc +++ b/docs/modules/demos/pages/argo-cd-git-ops.adoc @@ -302,7 +302,10 @@ Its credentials are synced from Git as a sealed secret and unsealed into the `s3 [source,console] ---- -$ export S3_ENDPOINT="https://$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[?(@.type=="InternalIP")].address}'):$(kubectl --namespace garage get service garage -o jsonpath='{.spec.ports[0].nodePort}')" +$ NODE_IP="$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[?(@.type=="InternalIP")].address}' | cut -d' ' -f1)" # a dual-stack node reports several +$ case "$NODE_IP" in *:*) NODE_IP="[$NODE_IP]";; esac # an IPv6 address needs brackets in a URL +$ NODE_PORT="$(kubectl --namespace garage get service garage -o jsonpath='{.spec.ports[0].nodePort}')" +$ export S3_ENDPOINT="https://$NODE_IP:$NODE_PORT" $ export S3_ACCESS_KEY="$(kubectl --namespace garage get secret s3-credentials -o jsonpath='{.data.accessKey}' | base64 -d)" $ export S3_SECRET_KEY="$(kubectl --namespace garage get secret s3-credentials -o jsonpath='{.data.secretKey}' | base64 -d)" ---- diff --git a/docs/modules/demos/partials/inspect-s3.adoc b/docs/modules/demos/partials/inspect-s3.adoc index 48f78235..5feb022d 100644 --- a/docs/modules/demos/partials/inspect-s3.adoc +++ b/docs/modules/demos/partials/inspect-s3.adoc @@ -5,7 +5,10 @@ Read the endpoint and credentials out of the cluster: [source,console] ---- $ KUBECTL_NAMESPACE="default" # or whichever you set when running stackablectl demo install -$ export S3_ENDPOINT="https://$(kubectl -n "$KUBECTL_NAMESPACE" get nodes -o jsonpath='{.items[0].status.addresses[?(@.type=="InternalIP")].address}'):$(kubectl -n "$KUBECTL_NAMESPACE" get service garage -o jsonpath='{.spec.ports[0].nodePort}')" +$ NODE_IP="$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[?(@.type=="InternalIP")].address}' | cut -d' ' -f1)" # a dual-stack node reports several +$ case "$NODE_IP" in *:*) NODE_IP="[$NODE_IP]";; esac # an IPv6 address needs brackets in a URL +$ NODE_PORT="$(kubectl -n "$KUBECTL_NAMESPACE" get service garage -o jsonpath='{.spec.ports[0].nodePort}')" +$ export S3_ENDPOINT="https://$NODE_IP:$NODE_PORT" $ export S3_ACCESS_KEY="$(kubectl -n "$KUBECTL_NAMESPACE" get secret s3-credentials -o jsonpath='{.data.accessKey}' | base64 -d)" $ export S3_SECRET_KEY="$(kubectl -n "$KUBECTL_NAMESPACE" get secret s3-credentials -o jsonpath='{.data.secretKey}' | base64 -d)" $ export S3_REGION=region-1