From e6c97b9593da3258613c687f79e7e5e2ae939ce7 Mon Sep 17 00:00:00 2001
From: Lennart Jern <lennart.jern@est.tech>
Date: Mon, 9 Jan 2023 13:17:43 +0200
Subject: [PATCH] cleanup: Fix paths and syntax

Minor cleanup of changed paths and deprecated syntax

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
---
 docs/deploy-cephfs.md                        | 2 +-
 scripts/k8s-storage/create-configmap.sh      | 2 +-
 scripts/k8s-storage/create-storageclasses.sh | 2 +-
 scripts/minikube.sh                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/deploy-cephfs.md b/docs/deploy-cephfs.md
index 4c01ec724..d90fcec2d 100644
--- a/docs/deploy-cephfs.md
+++ b/docs/deploy-cephfs.md
@@ -148,7 +148,7 @@ for more information.
 **Deploy Ceph configuration ConfigMap for CSI pods:**
 
 ```bash
-kubectl create -f ../../../example/ceph-config.yaml
+kubectl create -f ../../../examples/ceph-conf.yaml
 ```
 
 **Deploy CSI sidecar containers:**
diff --git a/scripts/k8s-storage/create-configmap.sh b/scripts/k8s-storage/create-configmap.sh
index c236f3da5..78828e0a8 100755
--- a/scripts/k8s-storage/create-configmap.sh
+++ b/scripts/k8s-storage/create-configmap.sh
@@ -20,7 +20,7 @@ NAMESPACE="${1}"
 set -e
 
 TOOLBOX_POD=$(kubectl -n rook-ceph get pods -l app=rook-ceph-tools -o=jsonpath='{.items[0].metadata.name}')
-FS_ID=$(kubectl -n rook-ceph exec "${TOOLBOX_POD}" ceph fsid)
+FS_ID=$(kubectl -n rook-ceph exec "${TOOLBOX_POD}" -- ceph fsid)
 MONITOR=$(kubectl -n rook-ceph get services -l app=rook-ceph-mon -o=jsonpath='{.items[0].spec.clusterIP}:{.items[0].spec.ports[0].port}')
 
 # in case the ConfigMap already exists, remove it before recreating
diff --git a/scripts/k8s-storage/create-storageclasses.sh b/scripts/k8s-storage/create-storageclasses.sh
index 326705572..975fa88c9 100755
--- a/scripts/k8s-storage/create-storageclasses.sh
+++ b/scripts/k8s-storage/create-storageclasses.sh
@@ -18,7 +18,7 @@ set -e
 WORKDIR=$(dirname "${0}")
 
 TOOLBOX_POD=$(kubectl -n rook-ceph get pods --no-headers -l app=rook-ceph-tools -o=jsonpath='{.items[0].metadata.name}')
-FS_ID=$(kubectl -n rook-ceph exec "${TOOLBOX_POD}" ceph fsid)
+FS_ID=$(kubectl -n rook-ceph exec "${TOOLBOX_POD}" -- ceph fsid)
 
 for sc in "${WORKDIR}"/sc-*.yaml.in
 do
diff --git a/scripts/minikube.sh b/scripts/minikube.sh
index 0b45b943a..b2e26f147 100755
--- a/scripts/minikube.sh
+++ b/scripts/minikube.sh
@@ -85,7 +85,7 @@ function install_minikube() {
     fi
 
     echo "Installing minikube. Version: ${MINIKUBE_VERSION}"
-    curl -Lo minikube https://storage.googleapis.com/minikube/releases/"${MINIKUBE_VERSION}"/minikube-linux-"${MINIKUBE_ARCH}" && chmod +x minikube && mv minikube /usr/local/bin/
+    curl -Lo minikube https://storage.googleapis.com/minikube/releases/"${MINIKUBE_VERSION}"/minikube-linux-"${MINIKUBE_ARCH}" && chmod +x minikube && sudo mv minikube /usr/local/bin/
 }
 
 function detect_kubectl() {