diff --git a/Makefile b/Makefile index 47a460cdf..ead2791a2 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,6 @@ undeploy: manifests kustomize # Generate manifests e.g. CRD, RBAC etc. manifests: controller-gen $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases - sed -i.bak "s,IMAGE,${IMG},g;s,CREATEDAT,${CREATEDAT},g" config/manifests/patches/csvAnnotations.yaml rm -f config/manifests/patches/csvAnnotations.yaml.bak # Run go fmt against code fmt: @@ -145,9 +144,11 @@ endif # Generate bundle manifests and metadata, then validate generated files. .PHONY: bundle bundle: manifests setup + sed -i.bak "s,IMAGE,${IMG},g;s,CREATEDAT,${CREATEDAT},g" config/manifests/patches/csvAnnotations.yaml operator-sdk generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) + mv config/manifests/patches/csvAnnotations.yaml.bak config/manifests/patches/csvAnnotations.yaml operator-sdk bundle validate ./bundle # Build the bundle image.