Skip to content

Commit f4060ed

Browse files
committed
Update scripts to include crds during release
1 parent bc89b65 commit f4060ed

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ endif
224224
./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
225225
ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
226226
ifeq ($(quickstart), true)
227-
./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
227+
./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/chart/crds deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
228228
endif
229229

230230
.PHONY: run-console-local

scripts/package_quickstart.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,25 @@ if [[ ${#@} < 3 ]]; then
99
exit 1
1010
fi
1111

12-
dir=$1
13-
out=$2
14-
outcrds=$3
15-
outscript=$4
12+
manifestdir=$1
13+
crddir=$2
14+
out=$3
15+
outcrds=$4
16+
outscript=$5
1617

1718
rm -f ${out}
1819
rm -f ${outcrds}
1920
touch ${out}
2021
touch ${outcrds}
2122

22-
for f in ${dir}/*.yaml
23+
for f in ${manifestdir}/*.yaml
2324
do
24-
if [[ $f == *.crd.yaml ]]
25-
then
26-
awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${outcrds}
27-
else
28-
awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${out}
29-
fi
25+
awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${out}
26+
done
27+
28+
for f in ${crddir}/*.yaml
29+
do
30+
awk 'NR==1 && !/^---*/ {print "---"} !/^[[:space:]]*#/ {print}' $f >> ${outcrds}
3031
done
3132

3233
echo "Wrote manifests to ${out} and ${outcrds}"

0 commit comments

Comments
 (0)