mirror of
https://github.com/arangodb/kube-arangodb.git
synced 2024-12-14 11:57:37 +00:00
Removed set -e
This commit is contained in:
parent
345a4f63e4
commit
3c38ee6fa6
2 changed files with 4 additions and 6 deletions
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
# Create the operator deployment with custom image option
|
# Create the operator deployment with custom image option
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
NS=$1
|
NS=$1
|
||||||
IMAGE=$2
|
IMAGE=$2
|
||||||
PULLPOLICY="${PULLPOLICY:-IfNotPresent}"
|
PULLPOLICY="${PULLPOLICY:-IfNotPresent}"
|
||||||
|
@ -21,7 +19,7 @@ if [ ! -z $USESHA256 ]; then
|
||||||
IMAGE=$(docker inspect --format='{{index .RepoDigests 0}}' ${IMAGE})
|
IMAGE=$(docker inspect --format='{{index .RepoDigests 0}}' ${IMAGE})
|
||||||
fi
|
fi
|
||||||
|
|
||||||
kubectl --namespace=$NS create -f - << EOYAML
|
config=$(cat << EOYAML
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: extensions/v1beta1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -48,6 +46,8 @@ spec:
|
||||||
fieldPath: metadata.name
|
fieldPath: metadata.name
|
||||||
|
|
||||||
EOYAML
|
EOYAML
|
||||||
|
)
|
||||||
|
echo "$config" | kubectl --namespace=$NS create -f - || exit 1
|
||||||
|
|
||||||
# Wait until custom resources are available
|
# Wait until custom resources are available
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
# Create the local storage in the cluster if the cluster needs it.
|
# Create the local storage in the cluster if the cluster needs it.
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
NS=$1
|
NS=$1
|
||||||
|
|
||||||
if [ -z $NS ]; then
|
if [ -z $NS ]; then
|
||||||
|
@ -18,7 +16,7 @@ eval $(kubectl get configmap $mapname -n kube-system --ignore-not-found --templa
|
||||||
|
|
||||||
if [ "${REQUIRE_LOCAL_STORAGE}" = "1" ]; then
|
if [ "${REQUIRE_LOCAL_STORAGE}" = "1" ]; then
|
||||||
echo "Preparing local storage"
|
echo "Preparing local storage"
|
||||||
kubectl apply -n $NS -f examples/arango-local-storage.yaml
|
kubectl apply -n $NS -f examples/arango-local-storage.yaml || exit 1
|
||||||
else
|
else
|
||||||
echo "No local storage needed for this cluster"
|
echo "No local storage needed for this cluster"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue