Skip to content

Commit

Permalink
chore(bors): merge pull request #454
Browse files Browse the repository at this point in the history
454: fix(upgrade-job): look for crds in charts dir r=niladrih a=niladrih

The upgrade-job validates the chart that it's got by checking if all the right directories are where they're supposed to be. Recent changes to the CRD installation method (ref: #414) has resulted in the upgrade-job failing, because things aren't how it expects. This PR changes the CRDs directory path to that of the subchart which encapsulates the CRDs now.

Co-authored-by: Niladri Halder <niladri.halder26@gmail.com>
  • Loading branch information
mayastor-bors and niladrih committed Mar 22, 2024
2 parents cdc37e5 + 5b7f16b commit f2c6b62
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion k8s/upgrade/src/bin/upgrade-job/opts/validators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ fn validate_core_helm_chart_variant_in_dir(dir_path: PathBuf) -> Result<()> {

// Validate crds directory.
let mut crds_dir_path = dir_path.clone();
crds_dir_path.push("crds");
crds_dir_path.push("charts/crds");
ensure!(
path_exists_and_is_dir(crds_dir_path.clone())?,
NotADirectory {
Expand Down

0 comments on commit f2c6b62

Please sign in to comment.