From 4f9f7f585c1bde3d387949c8aa0ed599b71e143e Mon Sep 17 00:00:00 2001 From: David Hoese <david.hoese@ssec.wisc.edu> Date: Fri, 14 Aug 2020 09:46:01 -0500 Subject: [PATCH] Revert debugging changes and document longhorn defaultClass setting --- admin/README.md | 2 +- helpers/deploy_rabbitmq.sh | 4 ++-- helpers/shell_aliases.sh | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/admin/README.md b/admin/README.md index f4c2b86..b893027 100644 --- a/admin/README.md +++ b/admin/README.md @@ -133,7 +133,7 @@ it can't make all of the replicas (only one replica per node). At the time of writing, kubekorner has had its longhorn instance installed with: ```bash -helm install longhorn ./chart/ --namespace longhorn-system --set defaultSettings.defaultReplicaCount=1 --set persistence.defaultClassReplicaCount=1 --set ingress.enabled=true --set ingress.host="kubekorner.ssec.wisc.edu" --set defaultSettings.defaultDataPath="/data" +helm install longhorn ./chart/ --namespace longhorn-system --set persistence.defaultClass=false --set defaultSettings.defaultReplicaCount=1 --set persistence.defaultClassReplicaCount=1 --set ingress.enabled=true --set ingress.host="kubekorner.ssec.wisc.edu" --set defaultSettings.defaultDataPath="/data" ``` From the webUI or following longhorn's current instructions we can change most diff --git a/helpers/deploy_rabbitmq.sh b/helpers/deploy_rabbitmq.sh index 3dcda61..286e470 100755 --- a/helpers/deploy_rabbitmq.sh +++ b/helpers/deploy_rabbitmq.sh @@ -16,7 +16,7 @@ cp $kubekorner_k3s_config . kubeconfig=$(basename $kubekorner_k3s_config) # get password from any previous installation # if we don't do this the password will get out of sync -sec_info=$(kubectl --kubeconfig $kubeconfig get secret --namespace geosphere-test geosphere-rabbit-rabbitmq || echo "") +sec_info=$(kubectl --kubeconfig $kubeconfig get secret --namespace $ns geosphere-rabbit-rabbitmq || echo "") echo $sec_info auth_sec="geosphere-rabbit-rabbitmq" if [[ "$sec_info" != "" ]]; then @@ -31,7 +31,7 @@ helm upgrade -v 2 --install --kubeconfig $kubeconfig -f ${values_base}/values-ge # do a little waiting for the rabbitmq pod to be ready so future stages # don't fail to communicate with it echo "Start waiting for rabbitmq: $(date +%Y%m%dT%H%M%S)" -kubectl2 wait --kubeconfig $kubeconfig -n $ns pod/geosphere-rabbit-rabbitmq-0 --timeout 120s --for=condition=Ready +kubectl wait --kubeconfig $kubeconfig -n $ns pod/geosphere-rabbit-rabbitmq-0 --timeout 120s --for=condition=Ready status=$? echo "Done waiting for rabbitmq: $(date +%Y%m%dT%H%M%S) : $status" exit $status diff --git a/helpers/shell_aliases.sh b/helpers/shell_aliases.sh index 0079eb4..70fabf3 100644 --- a/helpers/shell_aliases.sh +++ b/helpers/shell_aliases.sh @@ -11,8 +11,3 @@ kubectl() { docker run -a stdout --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl "$@" } export -f kubectl - -kubectl2() { - docker run --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl "$@" -} -export -f kubectl2 -- GitLab