Skip to content

Commit

Permalink
cleanup: Fix paths and syntax
Browse files Browse the repository at this point in the history
Minor cleanup of changed paths and deprecated syntax

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
  • Loading branch information
lentzi90 authored and mergify[bot] committed Jan 10, 2023
1 parent b7b491c commit e6c97b9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/deploy-cephfs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:**
Expand Down
2 changes: 1 addition & 1 deletion scripts/k8s-storage/create-configmap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/k8s-storage/create-storageclasses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/minikube.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit e6c97b9

Please sign in to comment.