feat: deploy Minibroker for Cloud Foundry (#95)

* feat: deploy Minibroker for Cloud Foundry Signed-off-by: Thulio Ferraz Assis <[email protected]> * fix: use single script to deploy Signed-off-by: Thulio Ferraz Assis <[email protected]> * fix: conditional xtrace for deploy script Co-authored-by: Mark Yen <[email protected]> Co-authored-by: Mark Yen <[email protected]>
kubernetes-retired · Jul 30, 2020 · 87dad2b · 87dad2b
1 parent 5a6362c
commit 87dad2b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -91,8 +91,18 @@ deploy:
 	OUTPUT_CHARTS_DIR="$(OUTPUT_CHARTS_DIR)" \
 	./build/deploy.sh
 
+deploy-cf:
+	IMAGE="$(IMAGE)" \
+	TAG="$(TAG)" \
+	IMAGE_PULL_POLICY="$(IMAGE_PULL_POLICY)" \
+	OUTPUT_CHARTS_DIR="$(OUTPUT_CHARTS_DIR)" \
+	CLOUDFOUNDRY=true \
+	./build/deploy.sh
+
 deploy-dev: image-in-minikube charts deploy
 
+deploy-dev-cf: image-in-minikube charts deploy-cf
+
 release: clean release-images release-charts
 
 release-images: image

diff --git a/build/deploy.sh b/build/deploy.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit -o nounset -o pipefail
+set -o errexit -o nounset -o pipefail ${XTRACE:+-o xtrace}
 
 until svcat version | grep -m 1 'Server Version: v' ; do
   sleep 1;
@@ -26,11 +26,12 @@ fi
 
 helm upgrade minibroker \
   --install \
-  --recreate-pods \
   --namespace minibroker \
   --wait \
   --set "image=${IMAGE}:${TAG}" \
   --set "imagePullPolicy=${IMAGE_PULL_POLICY}" \
   --set "deploymentStrategy=Recreate" \
   --set "logLevel=${LOG_LEVEL:-4}" \
+  ${CLOUDFOUNDRY:+--set "deployServiceCatalog=false"} \
+  ${CLOUDFOUNDRY:+--set "defaultNamespace=minibroker"} \
   "${OUTPUT_CHARTS_DIR}/minibroker-${TAG}.tgz"