1
0
Fork 0
mirror of https://github.com/arangodb/kube-arangodb.git synced 2024-12-14 11:57:37 +00:00

Fixed license deployment.

This commit is contained in:
lamai93 2018-12-03 15:52:13 +01:00
parent 23383b67bb
commit b18d6f351c
2 changed files with 4 additions and 3 deletions

View file

@ -310,7 +310,7 @@ endif
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
kubectl apply -f $(MANIFESTPATHTEST)
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)"
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)" "$(ENTERPRISELICENSE)"
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
$(DURATIONTESTBIN): $(GOBUILDDIR) $(SOURCES)

View file

@ -1,10 +1,11 @@
#!/bin/sh
if [ -z $ENTERPRISELICENSE ]; then
if [ -z $2 ]; then
echo "No enterprise license set"
exit 0
fi
LICENSE=$(echo "${ENTERPRISELICENSE}" | base64 )
LICENSE=$(echo "${2}" | base64 )
NS=$1
if [ -z $NS ]; then