diff --git a/class/defaults.yml b/class/defaults.yml index 0ed2008..e0e3e25 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -7,4 +7,6 @@ parameters: secretname: metallb-memberlist configmap_name: metallb charts: - metallb: 0.12.1 + metallb: + source: https://metallb.github.io/metallb + version: 0.12.1 diff --git a/class/metallb.yml b/class/metallb.yml index fe9eccf..6e28900 100644 --- a/class/metallb.yml +++ b/class/metallb.yml @@ -2,9 +2,9 @@ parameters: kapitan: dependencies: - type: helm - output_path: dependencies/metallb/helmcharts/metallb-${metallb:charts:metallb} - source: https://metallb.github.io/metallb - version: ${metallb:charts:metallb} + output_path: dependencies/metallb/helmcharts/metallb-${metallb:charts:metallb:version} + source: ${metallb:charts:metallb:source} + version: ${metallb:charts:metallb:version} chart_name: metallb compile: - input_paths: @@ -19,7 +19,7 @@ parameters: input_type: helm output_type: yaml input_paths: - - metallb/helmcharts/metallb-${metallb:charts:metallb} + - metallb/helmcharts/metallb-${metallb:charts:metallb:version} helm_values: speaker: secretName: ${metallb:speaker:secretname} diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc index 599cd01..fd1f0ed 100644 --- a/docs/modules/ROOT/pages/references/parameters.adoc +++ b/docs/modules/ROOT/pages/references/parameters.adoc @@ -72,10 +72,10 @@ For example this allows to specify multiple address pools: See the https://metallb.universe.tf/configuration/[MetalLB documentation] for more details. -== `charts.metallb` +== `charts.metallb.version` [horizontal] -type:: helm chart version -default:: 1.1.0 +type:: string +default:: See https://github.com/projectsyn/component-metallb/blob/master/class/defaults.yml[class/defaults.yml] -A specific chart version. See the https://kapitan.dev/external_dependencies/#helm-type[kapitan documentation] for more information. +The version of the `metallb` chart that's used.