From 2c93d97eaf07f426fb548141fa0cbe64d8683eae Mon Sep 17 00:00:00 2001 From: denverwilliams Date: Tue, 16 Feb 2021 18:30:34 -0500 Subject: [PATCH 1/2] Fix bug with generate_release_name using the wrong chart path cncf/cnf-conformance#612 --- src/tasks/utils/cnf_manager.cr | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tasks/utils/cnf_manager.cr b/src/tasks/utils/cnf_manager.cr index 26778738e..7207d9e4d 100644 --- a/src/tasks/utils/cnf_manager.cr +++ b/src/tasks/utils/cnf_manager.cr @@ -642,6 +642,7 @@ END def self.generate_and_set_release_name(config_yml_path) LOGGING.info "generate_and_set_release_name" yml_file = CNFManager.ensure_cnf_conformance_yml_path(config_yml_path) + yml_path = CNFManager.ensure_cnf_conformance_dir(config_yml_path) config = CNFManager.parsed_config_file(yml_file) predefined_release_name = optional_key_as_string(config, "release_name") @@ -654,8 +655,8 @@ END LOGGING.debug "helm_chart install method: #{install_method[1]}" release_name = helm_chart_template_release_name(install_method[1]) when :helm_directory - LOGGING.debug "helm_directory install method: #{yml_file}/#{install_method[1]}" - release_name = helm_chart_template_release_name("#{yml_file}/#{install_method[1]}") + LOGGING.debug "helm_directory install method: #{yml_path}/#{install_method[1]}" + release_name = helm_chart_template_release_name("#{yml_path}/#{install_method[1]}") when :manifest_directory LOGGING.debug "manifest_directory install method" release_name = UUID.random.to_s From b26911e7c17d442eb824d441850982c58b94c5ab Mon Sep 17 00:00:00 2001 From: denverwilliams Date: Tue, 16 Feb 2021 19:21:38 -0500 Subject: [PATCH 2/2] Fix fatal crystal error when release_name is not set cncf/cnf-conformance#612 --- src/tasks/utils/cnf_manager.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/utils/cnf_manager.cr b/src/tasks/utils/cnf_manager.cr index 7207d9e4d..616c72a36 100644 --- a/src/tasks/utils/cnf_manager.cr +++ b/src/tasks/utils/cnf_manager.cr @@ -358,7 +358,7 @@ END helm_repo_url = "" end helm_chart = optional_key_as_string(config, "helm_chart") - release_name = "#{config.get("release_name").as_s?}" + release_name = optional_key_as_string(config, "release_name") service_name = optional_key_as_string(config, "service_name") helm_directory = optional_key_as_string(config, "helm_directory") git_clone_url = optional_key_as_string(config, "git_clone_url")