From 8bb86e74c1a4c287bc1f0d728c17c597936401de Mon Sep 17 00:00:00 2001 From: nhramchihin Date: Sun, 26 Jul 2020 02:22:50 +0300 Subject: [PATCH] changed bundle script - fixed new tag setting with kustomize --- Makefile | 13 ++++++++++++- scripts/bundle.sh | 23 ----------------------- 2 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 scripts/bundle.sh diff --git a/Makefile b/Makefile index 15ab2db8..19de7206 100644 --- a/Makefile +++ b/Makefile @@ -238,4 +238,15 @@ bundle-build: build: manager release-package: kustomize - sh scripts/bundle.sh \ No newline at end of file + mkdir -p install/crds/ + mkdir install/operator + mkdir install/examples + kustomize build config/crd > install/crds/crd.yaml + kustomize build config/rbac > install/operator/rbac.yaml + cp config/examples/*.yaml install/examples/ + cd config/manager && \ + kustomize edit set image manager=$(DOCKER_REPO):$(TAG) + kustomize build config/manager > install/operator/manager.yaml + zip -r operator.zip bin/manager + zip -r bundle_crd.zip install/ + rm -rf install/ diff --git a/scripts/bundle.sh b/scripts/bundle.sh deleted file mode 100644 index 8caa308b..00000000 --- a/scripts/bundle.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env sh -set -e -set -x - - -mkdir -p install/crds/ -mkdir install/operator -mkdir install/examples -kustomize build config/crd > install/crds/crd.yaml -kustomize build config/rbac > install/operator/rbac.yaml -cp config/examples/*.yaml install/examples/ - -if [ $TAG ];then - cd config/default - kustomize edit set image manager=$TAG - cd - -fi - -kustomize build config/manager > install/operator/manager.yaml - -zip -r operator.zip bin/manager -zip -r bundle_crd.zip install/ -rm -rf install/ \ No newline at end of file