diff --git a/get-values-overrides b/get-values-overrides index f20dce9..5839daa 100755 Binary files a/get-values-overrides and b/get-values-overrides differ diff --git a/main.go b/main.go index 88ae721..1c46fe8 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" ) -const DefaultBaseUrl string = "https://opendev.org/openstack/openstack-helm/raw/branch/master" +const DefaultBaseUrl string = "https://opendev.org/openstack/openstack-helm/raw/branch/master/values_overrides" func newRootCommand() *cobra.Command { var cwd string @@ -45,13 +45,13 @@ func newRootCommand() *cobra.Command { If 3 features are passed, then the overrides will be looked up in the following order: -//values_overrides/.yaml -//values_overrides/.yaml -//values_overrides/-.yaml -//values_overrides/.yaml -//values_overrides/-.yaml -//values_overrides/-.yaml -//values_overrides/--.yaml +//.yaml +//.yaml +//-.yaml +//.yaml +//-.yaml +//-.yaml +//--.yaml If you think of the features as bits of a binary number where is the least significant bit, then the order corresponds to all numbers from 001 @@ -102,16 +102,16 @@ func num2items(num uint32, power int) []int { func overrideFile(basePath, chart, subchart, overrideName string) string { if subchart != "" { - return filepath.Join(basePath, chart, "values_overrides", subchart, overrideName) + return filepath.Join(basePath, chart, subchart, overrideName) } - return filepath.Join(basePath, chart, "values_overrides", overrideName) + return filepath.Join(basePath, chart, overrideName) } func overrideUrl(baseUrl, chart, subchart, overrideName string) string { if subchart != "" { - return fmt.Sprintf("%s/%s/values_overrides/%s/%s", baseUrl, chart, subchart, overrideName) + return fmt.Sprintf("%s/%s/%s/%s", baseUrl, chart, subchart, overrideName) } - return fmt.Sprintf("%s/%s/values_overrides/%s", baseUrl, chart, overrideName) + return fmt.Sprintf("%s/%s/%s", baseUrl, chart, overrideName) } func downloadOverride(baseUrl, basePath, chart, subchart, overrideName string) error { diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 3930500..5c31ec3 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -15,7 +15,7 @@ check: jobs: - openstack-helm-plugin-lint - - openstack-helm-plugin-compute-kit-metallb-2024-1-ubuntu_jammy # 1 node + 2 nodes + # - openstack-helm-plugin-compute-kit-metallb-2024-1-ubuntu_jammy # 1 node + 2 nodes gate: jobs: - openstack-helm-plugin-lint