Method name change and indent fix

fluxcd · Jul 1, 2019 · b32c6df · b32c6df
1 parent 11335d9
commit b32c6df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/integrations/apis/flux.weave.works/v1beta1/types.go b/integrations/apis/flux.weave.works/v1beta1/types.go
@@ -121,12 +121,12 @@ func (s RepoChartSource) CleanRepoURL() string {
 }
 
 type Rollback struct {
-	Enable 		 bool 	`json:"enable,omitempty"`
-	Force  		 bool 	`json:"force,omitempty"`
-	Recreate 	 bool 	`json:"recreate,omitempty"`
-	DisableHooks bool 	`json:"disableHooks,omitempty"`
+	Enable 		 bool `json:"enable,omitempty"`
+	Force  		 bool `json:"force,omitempty"`
+	Recreate 	 bool `json:"recreate,omitempty"`
+	DisableHooks bool `json:"disableHooks,omitempty"`
 	Timeout 	 *int64 `json:"timeout,omitempty"`
-	Wait 		 bool   `json:"wait,omitempty"`
+	Wait 		 bool `json:"wait,omitempty"`
 }
 
 func (r Rollback) GetTimeout() int64 {
@@ -165,9 +165,9 @@ func (r HelmRelease) GetTimeout() int64 {
 	return *r.Spec.Timeout
 }
 
-// GetValuesFromSource maintains backwards compatibility with
+// GetValuesFromSources maintains backwards compatibility with
 // ValueFileSecrets by merging them into the ValuesFrom array.
-func (r HelmRelease) GetValuesFromSource() []ValuesFromSource {
+func (r HelmRelease) GetValuesFromSources() []ValuesFromSource {
 	valuesFrom := r.Spec.ValuesFrom
 	// Maintain backwards compatibility with ValueFileSecrets
 	if r.Spec.ValueFileSecrets != nil {

diff --git a/integrations/helm/chartsync/chartsync.go b/integrations/helm/chartsync/chartsync.go
@@ -300,7 +300,7 @@ func (chs *ChartChangeSync) CompareValuesChecksum(fhr fluxv1beta1.HelmRelease) b
 		}
 	}
 
-	values, err := release.Values(chs.kubeClient.CoreV1(), fhr.Namespace, chartPath, fhr.GetValuesFromSource(), fhr.Spec.Values)
+	values, err := release.Values(chs.kubeClient.CoreV1(), fhr.Namespace, chartPath, fhr.GetValuesFromSources(), fhr.Spec.Values)
 	if err != nil {
 		return false
 	}

diff --git a/integrations/helm/release/release.go b/integrations/helm/release/release.go
@@ -185,7 +185,7 @@ func (r *Release) Install(chartPath, releaseName string, fhr flux_v1beta1.HelmRe
 		"options", fmt.Sprintf("%+v", opts),
 		"timeout", fmt.Sprintf("%vs", fhr.GetTimeout()))
 
-	vals, err := Values(kubeClient.CoreV1(), fhr.Namespace, chartPath, fhr.GetValuesFromSource(), fhr.Spec.Values)
+	vals, err := Values(kubeClient.CoreV1(), fhr.Namespace, chartPath, fhr.GetValuesFromSources(), fhr.Spec.Values)
 	if err != nil {
 		r.logger.Log("error", fmt.Sprintf("Failed to compose values for Chart release [%s]: %v", fhr.Spec.ReleaseName, err))
 		return nil, "", err