Skip to content

Commit 5f63716

Browse files
committed
fix PR comments
Signed-off-by: matancarmeli7 <matan.carmeli7@gmail.com>
1 parent 97ed4dd commit 5f63716

2 files changed

Lines changed: 19 additions & 12 deletions

File tree

hack/check-files-alignment.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ check_generation (){
3333
cd $project_dirname
3434
}
3535

36+
verify_yaml_doc_in_multidoc_yaml(){
37+
yamls_dictionary=${1#*=}
38+
eval "declare -A yaml_kinds_by_origin_yaml_path="${yamls_dictionary}
39+
for orignial_yaml in ${!yaml_kinds_by_origin_yaml_path[@]}; do
40+
export resource_type=${yaml_kinds_by_origin_yaml_path[${orignial_yaml}]}
41+
diff <(yq e '... comments=""' $orignial_yaml) <(yq eval '(. | select(.kind == env(resource_type)))' $operator_yaml_path)
42+
done
43+
}
44+
3645
verify_full_operator_yaml_is_aligned(){
3746
echo "check full operator yaml alignment"
3847
declare -A yaml_kinds_by_origin_yaml_path=(
@@ -42,15 +51,12 @@ verify_full_operator_yaml_is_aligned(){
4251
["config/rbac/role_binding.yaml"]="ClusterRoleBinding"
4352
["config/manager/manager.yaml"]="Deployment"
4453
)
45-
for orignial_yaml in ${!yaml_kinds_by_origin_yaml_path[@]}; do
46-
export resource_type=${yaml_kinds_by_origin_yaml_path[${orignial_yaml}]}
47-
diff <(yq e '... comments=""' $orignial_yaml) <(yq eval '(. | select(.kind == env(resource_type)))' $operator_yaml_path)
48-
done
54+
verify_yaml_doc_in_multidoc_yaml "$(declare -p yaml_kinds_by_origin_yaml_path)"
4955
}
5056

5157
verify_no_roles_diff (){
5258
echo "check roles alignment"
53-
are_manifest_files_exsists_in_current_csi_version
59+
are_manifest_files_exist_in_current_csi_version
5460
csv_files=$(get_csv_files)
5561
for csv_file in $csv_files; do
5662
diff <(yq e .rules $roles_yaml_path) <(yq e .spec.install.spec.clusterPermissions[0].rules $csv_file)
@@ -59,7 +65,7 @@ verify_no_roles_diff (){
5965

6066
verify_no_crds_diff (){
6167
echo "check crds alignment"
62-
are_manifest_files_exsists_in_current_csi_version
68+
are_manifest_files_exist_in_current_csi_version
6369
crd_files=$(get_bundle_crds)
6470
for crd_file in $crd_files; do
6571
diff $crd_yaml_path $crd_file

hack/project_info.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@ get_current_csi_version (){
2323
echo ${current_csi_version//\"}
2424
}
2525

26-
are_manifest_files_exsists_in_current_csi_version (){
27-
current_csi_version=$(get_current_csi_version)
26+
current_csi_version=$(get_current_csi_version)
27+
28+
are_manifest_files_exist_in_current_csi_version (){
2829
if ! compgen -G "${PWD}/deploy/olm-catalog/*/$current_csi_version" > /dev/null; then
2930
exit 0
3031
fi
3132
}
3233

3334
get_csv_files (){
34-
current_csi_version=$(get_current_csi_version)
35-
ls deploy/olm-catalog/*/$current_csi_version/manifests/ibm-block-csi-operator.v$current_csi_version.clusterserviceversion.yaml
35+
ls deploy/olm-catalog/ibm-block-csi-operator-community/$current_csi_version/manifests/ibm-block-csi-operator.v$current_csi_version.clusterserviceversion.yaml
36+
ls deploy/olm-catalog/ibm-block-csi-operator/$current_csi_version/manifests/ibm-block-csi-operator.clusterserviceversion.yaml
3637
}
3738

3839
get_bundle_crds (){
39-
current_csi_version=$(get_current_csi_version)
40-
ls deploy/olm-catalog/*/$current_csi_version/manifests/csi.ibm.com_ibmblockcsis.yaml
40+
ls deploy/olm-catalog/ibm-block-csi-operator-community/$current_csi_version/manifests/csi.ibm.com_ibmblockcsis.yaml
41+
ls deploy/olm-catalog/ibm-block-csi-operator/$current_csi_version/manifests/csi.ibm.com_ibmblockcsis.yaml
4142
}

0 commit comments

Comments
 (0)