fold subNotes into updateReq and instReq

Signed-off-by: jgleonard <jgleonard@gmail.com>

pkg/helm/client.go

@@ -95,7 +95,6 @@ func (h *Client) InstallReleaseFromChart(chart *chart.Chart, ns string, opts ...
 	req := &reqOpts.instReq
 	req.Chart = chart
 	req.Namespace = ns
-	req.SubNotes = reqOpts.subNotes
 	req.DryRun = reqOpts.dryRun
 	req.DisableHooks = reqOpts.disableHooks
 	req.DisableCrdHook = reqOpts.disableCRDHook
@@ -172,7 +171,6 @@ func (h *Client) UpdateReleaseFromChart(rlsName string, chart *chart.Chart, opts
 	req.DryRun = reqOpts.dryRun
 	req.Name = rlsName
 	req.DisableHooks = reqOpts.disableHooks
-	req.SubNotes = reqOpts.subNotes
 	req.Recreate = reqOpts.recreate
 	req.Force = reqOpts.force
 	req.ResetValues = reqOpts.resetValues

pkg/helm/option.go

@@ -54,8 +54,6 @@ type options struct {
 	// if set, skip CRD hook only
 	disableCRDHook bool
 	// if set, render SubChart Notes
-	subNotes bool
-	// name of release
 	releaseName string
 	// tls.Config to use for rpc if tls enabled
 	tlsConfig *tls.Config
@@ -344,14 +342,14 @@ func InstallReuseName(reuse bool) InstallOption {
 // InstallSubNotes will (if true) instruct Tiller to render SubChart Notes
 func InstallSubNotes(enable bool) InstallOption {
 	return func(opts *options) {
-		opts.subNotes = enable
+		opts.instReq.SubNotes = enable
 	}
 }
 
 // UpgradeSubNotes will (if true) instruct Tiller to render SubChart Notes
 func UpgradeSubNotes(enable bool) UpdateOption {
 	return func(opts *options) {
-		opts.subNotes = enable
+		opts.updateReq.SubNotes = enable
 	}
 }