Install kustomize before building bundle (#287)

* Install kustomize before building bundle Signed-off-by: leochr <[email protected]> * Update channels Signed-off-by: leochr <[email protected]>
application-stacks · Nov 24, 2021 · 2b44292 · 2b44292
1 parent a045c1c
commit 2b44292
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ PUBLISH_REGISTRY=docker.io
 BUNDLE_IMG ?= applicationstacks/operator:bundle-daily
 
 # Options for 'bundle-build'
-CHANNELS ?= beta,beta2
+CHANNELS ?= beta2
 DEFAULT_CHANNEL ?= beta2
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
@@ -180,7 +180,7 @@ install-podman:
 install-opm:
 	./scripts/installers/install-opm.sh
 
-bundle-build-podman: bundle
+bundle-build-podman:
 	podman build -f bundle.Dockerfile -t "${BUNDLE_IMG}"
 
 bundle-push-podman:

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=runtime-component
-LABEL operators.operatorframework.io.bundle.channels.v1=beta,beta2
+LABEL operators.operatorframework.io.bundle.channels.v1=beta2
 LABEL operators.operatorframework.io.bundle.channel.default.v1=beta2
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.6.1+git

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,7 +4,7 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: runtime-component
-  operators.operatorframework.io.bundle.channels.v1: beta,beta2
+  operators.operatorframework.io.bundle.channels.v1: beta2
   operators.operatorframework.io.bundle.channel.default.v1: beta2
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.6.1+git

diff --git a/scripts/bundle-releases.sh b/scripts/bundle-releases.sh
@@ -63,7 +63,7 @@ bundle_release() {
 
   # Build the bundle
   local bundle_ref="${IMAGE}:bundle-${release_tag}"
-  make bundle-build-podman bundle-push-podman IMG="${operator_ref}" BUNDLE_IMG="${bundle_ref}"
+  make kustomize bundle bundle-build-podman bundle-push-podman IMG="${operator_ref}" BUNDLE_IMG="${bundle_ref}"
 
   # Build the catalog
   local catalog_ref="${IMAGE}:catalog-${release_tag}"