Skip to content

Commit b18d6f3

Browse files
author
lamai93
committed
Fixed license deployment.
1 parent 23383b6 commit b18d6f3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ endif
310310
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
311311
kubectl apply -f $(MANIFESTPATHTEST)
312312
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
313-
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)"
313+
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)" "$(ENTERPRISELICENSE)"
314314
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
315315

316316
$(DURATIONTESTBIN): $(GOBUILDDIR) $(SOURCES)

scripts/kube_create_license_key_secret.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/sh
22

3-
if [ -z $ENTERPRISELICENSE ]; then
3+
if [ -z $2 ]; then
4+
echo "No enterprise license set"
45
exit 0
56
fi
67

7-
LICENSE=$(echo "${ENTERPRISELICENSE}" | base64 )
8+
LICENSE=$(echo "${2}" | base64 )
89
NS=$1
910

1011
if [ -z $NS ]; then

0 commit comments

Comments
 (0)