From 7fc0bb762d4e5df2d0932ac78c09bfca1b1a197c Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Wed, 29 Nov 2023 12:59:54 -0600 Subject: [PATCH 1/2] demo install from published tag Signed-off-by: Jordan Keister --- README.md | 2 +- hack/scripts/demo-script.sh | 11 +++++++---- hack/scripts/generate-asciidemo.sh | 17 +++++++++++++++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 76b2535..30a0abc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Catalogd is a Kubernetes extension that unpacks [file-based catalog (FBC)](https Catalogd helps customers discover installable content by hosting catalog metadata for Kubernetes extensions, such as Operators and controllers. For more information on the Operator Lifecycle Manager (OLM) v1 suite of microservices, see the [documentation](https://github.com/operator-framework/operator-controller/tree/main/docs) for the Operator Controller. ## Quickstart DEMO -[![asciicast](https://asciinema.org/a/623959.svg)](https://asciinema.org/a/623959) +[![asciicast](https://asciinema.org/a/624027.svg)](https://asciinema.org/a/624027) ## Quickstart Steps **NOTE:** Procedure steps marked with an asterisk (`*`) are likely to change with future API updates. diff --git a/hack/scripts/demo-script.sh b/hack/scripts/demo-script.sh index 95c79bb..6d39d6c 100755 --- a/hack/scripts/demo-script.sh +++ b/hack/scripts/demo-script.sh @@ -2,12 +2,15 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # Welcome to the catalogd demo -make kind-cluster-cleanup +kind delete cluster --name catalogd kind delete cluster -make kind-cluster -kubectl cluster-info --context kind-catalogd +kind create cluster +kubectl cluster-info --context kind-kind sleep 10 -make install +# install CRDs +# could also `make install` in repo +kubectl apply -f https://github.com/operator-framework/catalogd/releases/latest/download/catalogd.yaml +kubectl wait --for=condition=Available -n catalogd-system deploy/catalogd-controller-manager --timeout=60s sleep 10 # inspect crds (catalog) kubectl get crds -A diff --git a/hack/scripts/generate-asciidemo.sh b/hack/scripts/generate-asciidemo.sh index 5b0a29c..aa72621 100755 --- a/hack/scripts/generate-asciidemo.sh +++ b/hack/scripts/generate-asciidemo.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -v - trap cleanup SIGINT SIGTERM EXIT SCRIPTPATH="$( cd -- "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )" @@ -22,6 +20,21 @@ function cleanup() { fi } +function usage() { + echo "$0 [options]" + echo "where options is" + echo " h help (this message)" + exit 1 +} + +set +u +while getopts 'h' flag; do + case "${flag}" in + h) usage ;; + esac + shift +done +set -u WKDIR=$(mktemp -td generate-asciidemo.XXXXX) if [ ! -d ${WKDIR} ] From 801812d7ab73dbde1a84ca288da906e635d69ac2 Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Wed, 29 Nov 2023 14:14:01 -0600 Subject: [PATCH 2/2] review updates Signed-off-by: Jordan Keister --- README.md | 2 +- hack/scripts/demo-script.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 30a0abc..abd3a2e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Catalogd is a Kubernetes extension that unpacks [file-based catalog (FBC)](https Catalogd helps customers discover installable content by hosting catalog metadata for Kubernetes extensions, such as Operators and controllers. For more information on the Operator Lifecycle Manager (OLM) v1 suite of microservices, see the [documentation](https://github.com/operator-framework/operator-controller/tree/main/docs) for the Operator Controller. ## Quickstart DEMO -[![asciicast](https://asciinema.org/a/624027.svg)](https://asciinema.org/a/624027) +[![asciicast](https://asciinema.org/a/624043.svg)](https://asciinema.org/a/624043) ## Quickstart Steps **NOTE:** Procedure steps marked with an asterisk (`*`) are likely to change with future API updates. diff --git a/hack/scripts/demo-script.sh b/hack/scripts/demo-script.sh index 6d39d6c..46942b4 100755 --- a/hack/scripts/demo-script.sh +++ b/hack/scripts/demo-script.sh @@ -2,12 +2,11 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT # Welcome to the catalogd demo -kind delete cluster --name catalogd kind delete cluster kind create cluster kubectl cluster-info --context kind-kind sleep 10 -# install CRDs +# install catalogd on the cluster # could also `make install` in repo kubectl apply -f https://github.com/operator-framework/catalogd/releases/latest/download/catalogd.yaml kubectl wait --for=condition=Available -n catalogd-system deploy/catalogd-controller-manager --timeout=60s