Fix glitches in the integration test.

scripts/integration-test

@@ -9,9 +9,9 @@ source ./scripts/try.sh
 try --delay 2 --max 30 --waitmsg "Waiting for rancher to start" --failmsg "No rancher here" kubectl rollout status --watch=true --timeout=10s -n cattle-system deploy/rancher
 echo "Rancher deployed"
 
-# Wait for rancher to start up
-try --delay 2 --max 30 --waitmsg "Waiting for rancher/webhook to be deployed" --failmsg "No rancher here" kubectl rollout status --watch=true --timeout=10s -n cattle-system deploy/rancher-webhook
-echo "Rancher deployed"
+# Wait for the rancher webhook to start up
+try --delay 2 --max 30 --waitmsg "Waiting for rancher/webhook to be deployed" --failmsg "No webhook here" kubectl rollout status --watch=true --timeout=10s -n cattle-system deploy/rancher-webhook
+echo "Webhook deployed"
 
 webhook_deployed() {
     status=$(kubectl get apps.catalog.cattle.io -n cattle-system rancher-webhook -o jsonpath="{@.status.summary.state}") && [[ "$status" == "deployed" ]]
@@ -21,13 +21,6 @@ webhook_deployed() {
 try --delay 2 --max 30 --waitmsg "Waiting for webhook to be deployed (2)" webhook_deployed
 echo "Webhook deployed"
 
-# Wait for helm operation to complete and save rancher-webhook release info before we kill rancher and the cluster.
-app_catalog_deployed() {
-  status=$(kubectl get apps.catalog.cattle.io -n cattle-system rancher-webhook -o jsonpath="{@.status.summary.state}") && [[ "$status" == "deployed" ]]
-}
-
-try --delay 2 --max 30 --waitmsg "Waiting for app-catalog to be helm-deployed (2)" app_catalog_deployed
-
 # Shut down the core rancher part, but leave the rest of the rancher environment running
 
 kubectl scale deploy rancher -n cattle-system --replicas=0 --timeout=10m