review resolutions

Signed-off-by: Jordan Keister <[email protected]>

Author: grokspawn

Makefile

@@ -302,7 +302,7 @@ kind-clean: $(KIND) #EXHELP Delete the kind cluster.
 #SECTION Build
 
 # attempt to generate the VERSION attribute for certificates
-# fail if it is unset afterwards, since the sideeffects are indirect
+# fail if it is unset afterwards, since the side effects are indirect
 ifeq ($(strip $(VERSION)),)
 VERSION := $(shell git describe --tags --always --dirty)
 endif

hack/demo/catalogd-demo-script.sh

@@ -23,7 +23,7 @@ kubectl wait --for=condition=Available -n olmv1-system deploy/catalogd-controlle
 echo "... checking clustercatalog is serving"
 kubectl wait --for=condition=Serving clustercatalog/operatorhubio --timeout=60s
 echo "... checking clustercatalog is finished unpacking"
-kubectl wait --for=condition=Progressing=False clustercatalog/operatorhubio --timeout=60s
+kubectl wait --for=condition=Progressing=True clustercatalog/operatorhubio --timeout=60s
 
 # port forward the catalogd-service service to interact with the HTTP server serving catalog contents
 (kubectl -n olmv1-system port-forward svc/catalogd-service 8081:443)&

hack/demo/catalogd-metas-demo-script.sh

@@ -4,13 +4,13 @@
 #
 trap 'trap - SIGTERM && kill -- -"$$"' SIGINT SIGTERM EXIT
 
-## until we cut a release containing the new API, we need to deploy local artifacts
-make kind-clean
-make run
-#
-## use the install script from the latest github release
-#curl -L -s https://github.com/operator-framework/operator-controller/releases/latest/download/install.sh | bash
-#
+kind delete cluster
+kind create cluster
+kubectl cluster-info --context kind-kind
+sleep 10
+
+# use the install script from the latest github release
+curl -L -s https://github.com/operator-framework/operator-controller/releases/latest/download/install.sh | bash
 
 # inspect crds (clustercatalog)
 kubectl get crds -A
@@ -24,19 +24,19 @@ kubectl patch -n olmv1-system deploy/catalogd-controller-manager --type='json' -
 
 # ... waiting for new deployment for catalogd controller to become available
 kubectl rollout status -n olmv1-system deploy/catalogd-controller-manager
+kubectl wait --for=condition=Available -n olmv1-system deploy/catalogd-controller-manager --timeout=1m
 # ... checking clustercatalog is serving
 kubectl wait --for=condition=Serving clustercatalog/operatorhubio --timeout=60s
 # ... checking clustercatalog is finished unpacking (progressing gone back to true)
 kubectl wait --for=condition=Progressing=True clustercatalog/operatorhubio --timeout=60s
 
-sleep 30
 
 # port forward the catalogd-service service to interact with the HTTP server serving catalog contents
 (kubectl -n olmv1-system port-forward svc/catalogd-service 8081:443)&
 
 
 # check what 'packages' are available in this catalog
-curl -f -k 'https://localhost:8081/catalogs/operatorhubio/api/v1/metas?schema=olm.package' | jq -s '.[] | .name'
+curl -f --retry-all-errors --retry 10 -k 'https://localhost:8081/catalogs/operatorhubio/api/v1/metas?schema=olm.package' | jq -s '.[] | .name'
 # check what channels are included in the wavefront package
 curl -f -k 'https://localhost:8081/catalogs/operatorhubio/api/v1/metas?schema=olm.channel&package=wavefront' | jq -s '.[] |.name'
 # check what bundles are included in the wavefront package