seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes after review 

Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
pull/1079/head
Flavius Lacatusu 2021-09-20 15:15:50 +02:00
parent e4bf44f0e1
commit 32a8efbe9c
No known key found for this signature in database
GPG Key ID: 1F5C00691820AC13
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -470,6 +470,11 @@ bundle: generate manifests kustomize ## Generate bundle manifests and metadata,
exit 1
fi
if [ -z "$(channel)" ]; then
echo "[INFO] You must specify 'channel' macros. For example: `make bundle platform=kubernetes channel=next`"
exit 1
fi
if [ -z "$(NO_INCREMENT)" ]; then
$(MAKE) increment-next-version platform="$${platform}"
fi
@ -661,7 +666,7 @@ bundle: generate manifests kustomize ## Generate bundle manifests and metadata,
yq -Yi '.spec.installModes[] |= if .type=="SingleNamespace" then .supported |= false else . end' "$${NEW_CSV}"
yq -Yi '.spec.installModes[] |= if .type=="MultiNamespace" then .supported |= false else . end' "$${NEW_CSV}"
yq -Yi '.spec.installModes[] |= if .type=="AllNamespaces" then .supported |= true else . end' "$${NEW_CSV}"
sed -ri 's|operatorframework.io/suggested-namespace: eclipse-che|operatorframework.io/suggested-namespace: openshift-operators|' "$${NEW_CSV}"
yq -rYi '.metadata.annotations["operatorframework.io/suggested-namespace"] |= "openshift-operators"' "$${NEW_CSV}"
# Enable by default devWorkspace engine in `next-all-namespaces` channel
CSV_CR_SAMPLES=$$(yq -r ".metadata.annotations[\"alm-examples\"] | \
@ -720,6 +725,12 @@ increment-next-version:
exit 1
fi
if [ -z "$(channel)" ]; then
echo "[INFO] You must specify 'channel' macros. For example: `make bundle platform=kubernetes channel=next`"
exit 1
fi
NEXT_BUNDLE_PATH=$$($(MAKE) getBundlePath platform="$(platform)" channel="$(channel)" -s)
OPM_BUNDLE_MANIFESTS_DIR="$${NEXT_BUNDLE_PATH}/manifests"
CSV="$${OPM_BUNDLE_MANIFESTS_DIR}/che-operator.clusterserviceversion.yaml"