Skip to content

Commit 2461bef

Browse files
authored
fixed name resolution (#55)
1 parent 3fb53e2 commit 2461bef

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

olm/build-bundles.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ parse_inputs() {
3333
shift
3434
done
3535

36-
# e.g. "airflow" instead of "airflow-operator"
37-
OPERATOR=$(echo "${OPERATOR_NAME}" | cut -d- -f1)
36+
# e.g. "airflow" , "spark-k8s"
37+
OPERATOR=$(basename "${OPERATOR_NAME}" | rev | cut -d- -f2- | rev)
3838
}
3939

4040
bundle-clean() {

olm/build-manifests.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# ./olm/build-manifests.sh -r 23.11.0 -c $HOME/repo/stackable/openshift-certified-operators -o $HOME/repo/stackable/zookeeper-operator
1212
#
1313
# Before running the script:
14+
# * Ensure the certified-operators and operator repos are located on the correct branches (the branches are not supplied as arguments).
1415
# * Update the supported OpenShift version range in the `generate_metadata()` function.
1516
#
1617
# The generated manifests need to be updated manually with the following steps:
@@ -111,8 +112,8 @@ parse_inputs() {
111112
shift
112113
done
113114

114-
# e.g. "airflow" instead of "airflow-operator"
115-
PRODUCT=$(basename "${OP_ROOT}" | cut -d- -f1)
115+
# e.g. "airflow" instead of "airflow-operator", "spark-k8s" instead of "spark-k8s-operator"
116+
PRODUCT=$(basename "${OP_ROOT}" | rev | cut -d- -f2- | rev)
116117

117118
OPERATOR="$PRODUCT-operator"
118119
MANIFESTS_DIR="$OPENSHIFT_ROOT/operators/stackable-$OPERATOR/$RELEASE_VERSION/manifests"

0 commit comments

Comments
 (0)