diff --git a/chart/templates/wrapper/helmrelease.yaml b/chart/templates/wrapper/helmrelease.yaml index d8c98cbe64405c65068f2e72b01bf5c82863eab7..b0ac7a7b2e758da8e832417d3c0523fa2dc77d15 100644 --- a/chart/templates/wrapper/helmrelease.yaml +++ b/chart/templates/wrapper/helmrelease.yaml @@ -1,6 +1,6 @@ {{- /* Used for Helm chart deployment of Big Bang wrapper. One per package. */ -}} {{- range $pkg, $vals := .Values.packages -}} -{{- if (dig "enabled" true $vals) -}} +{{- if and (dig "enabled" true $vals) (dig "wrapper" "enabled" false $vals) -}} {{- $pkg = include "resourceName" $pkg -}} {{- $fluxSettings := merge (dig "flux" dict $vals) $.Values.flux -}} apiVersion: helm.toolkit.fluxcd.io/v2beta1 diff --git a/chart/templates/wrapper/values.yaml b/chart/templates/wrapper/values.yaml index 7662723e37034a132858c778b2f1154ac0c497a0..18c1f023cce9c8441dbe092fe6773fc5e4e47ab1 100644 --- a/chart/templates/wrapper/values.yaml +++ b/chart/templates/wrapper/values.yaml @@ -1,6 +1,6 @@ {{- /* Used for creating values to use for Helm wrapper and package Helm charts. */ -}} {{- range $pkg, $vals := .Values.packages -}} -{{- if (dig "enabled" true $vals) -}} +{{- if and (dig "enabled" true $vals) (dig "wrapper" "enabled" false $vals) -}} {{- $pkg = include "resourceName" $pkg -}} apiVersion: v1 kind: Secret diff --git a/docs/guides/deployment-scenarios/extra-package-deployment.md b/docs/guides/deployment-scenarios/extra-package-deployment.md index e6a549525dd72a9601bb452ef5a60c82bd1de5ef..e709d628091e704c5031434b43d2514ec2bc7d65 100644 --- a/docs/guides/deployment-scenarios/extra-package-deployment.md +++ b/docs/guides/deployment-scenarios/extra-package-deployment.md @@ -57,11 +57,15 @@ The wrapper does not add anything additional to your deployment, unless you also ```yaml packages: podinfo: + enabled: true + wrapper: + enabled: true git: repo: https://github.com/stefanprodan/podinfo.git tag: 6.3.4 path: charts/podinfo ``` +NOTE: The wrapper is an opt-in feature. Without enabling the wrapper, the `packages` will default to deploying flux object for your chart, without any wrapper-added configuration. The package also has OCI support for sourcing the artifacts; usage will be encouraged with the move to 2.0 and "first-class" support for `HelmRepository` resources. @@ -69,7 +73,7 @@ With these values added you should have a very basic deployment of `podinfo` add ### Basic Overrides -There are some basic ovveride values provides to modify your Helm chart installation. An example of these values is included below: +There are some basic override values provided to modify your Helm chart installation. These do NOT require the `wrapper`. An example of these values is included below: ```yaml packages: @@ -102,6 +106,8 @@ packages: repo: https://github.com/stefanprodan/podinfo.git tag: 6.3.4 path: charts/podinfo + wrapper: + enabled: true istio: hosts: - names: @@ -127,6 +133,8 @@ packages: repo: https://github.com/stefanprodan/podinfo.git tag: 6.3.4 path: charts/podinfo + wrapper: + enabled: true monitor: services: - spec: @@ -149,6 +157,8 @@ packages: repo: https://github.com/stefanprodan/podinfo.git tag: 6.3.4 path: charts/podinfo + wrapper: + enabled: true network: allowControlPlaneEgress: true ``` @@ -168,6 +178,8 @@ packages: repo: https://github.com/stefanprodan/podinfo.git tag: 6.3.4 path: charts/podinfo + wrapper: + enabled: true configMaps: - name: config data: