wip: configure helmfile promotion per env

docs/config.md

@@ -286,13 +286,13 @@ same cluster using the same git repository URL as the dev environment</p>
 </tr>
 <tr>
 <td>
-<code>keepOldReleases</code></br>
+<code>KeepOldVersions</code></br>
 <em>
-bool
+[]string
 </em>
 </td>
 <td>
-<p>KeepOldReleases if specified will cause the old releases to be retailed in the helfile</p>
+<p>KeepOldVersions if specified will cause the named repo/release releases to be retailed in the helmfile</p>
 </td>
 </tr>
 </tbody>

pkg/apis/promote/v1alpha1/types.go

@@ -53,10 +53,6 @@ type HelmfileRule struct {
 	// same cluster using the same git repository URL as the dev environment
 	Namespace string `json:"namespace"`
 
-	// KeepOldReleases if specified will cause the old releases to be retailed in the helfile
-	// Deprecated : use KeepOldVersions
-	KeepOldReleases bool `json:"keepOldReleases"`
-
 	// KeepOldVersions if specified is a list of release names and if the release name is in this list then the old versions are kept
 	KeepOldVersions []string `json:"keepOldVersions"`
 }

pkg/promoteconfig/helpers.go

@@ -48,6 +48,7 @@ func Discover(dir, promoteNamespace string) (*v1alpha1.Promote, string, error) {
 	if err != nil {
 		return nil, "", errors.Wrapf(err, "failed to find helmfile")
 	}
+
 	config = &v1alpha1.Promote{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "generated",
@@ -59,6 +60,7 @@ func Discover(dir, promoteNamespace string) (*v1alpha1.Promote, string, error) {
 			},
 		},
 	}
+
 	return config, "", nil
 }
 

pkg/rules/factory/factory_test.go

@@ -35,6 +35,9 @@ func TestRuleFactory(t *testing.T) {
 			if name == "jenkins-x-versions" {
 				continue
 			}
+			if name != "helmfile-per-env-keep-old-version" {
+				continue
+			}
 
 			dir := filepath.Join(tmpDir, name)
 

pkg/rules/factory/test_data/helmfile-per-env-keep-old-version/helmfiles/jx/promote.yaml

@@ -0,0 +1,5 @@
+apiVersion: promote.jenkins-x.io/v1alpha1
+kind: HelmfilePromote
+spec:
+  keepOldVersions:
+  - dev/myapp

pkg/rules/helmfile/helmfile_rule.go

@@ -2,6 +2,7 @@ package helmfile
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -12,9 +13,11 @@ import (
 	"github.com/jenkins-x/jx-promote/pkg/rules"
 	"github.com/pkg/errors"
 	"github.com/roboll/helmfile/pkg/state"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	kyaml "sigs.k8s.io/yaml"
 )
 
-// HelmfileRule uses a jx-apps.yml file
+// Rule uses a helmfile.yaml file
 func Rule(r *rules.PromoteRule) error {
 	config := r.Config
 	if config.Spec.HelmfileRule == nil {
@@ -25,7 +28,21 @@ func Rule(r *rules.PromoteRule) error {
 		rule.Path = "helmfile.yaml"
 	}
 
-	err := modifyHelmfile(r, rule, filepath.Join(r.Dir, rule.Path), rule.Namespace)
+	envHelmfileRulePath := filepath.Join(r.Dir, "helmfiles", rule.Namespace, "promote.yaml")
+	exists, err := files.FileExists(envHelmfileRulePath)
+	if err != nil {
+		return errors.Wrapf(err, "failed to check if file exists %s", envHelmfileRulePath)
+	}
+	if exists {
+		// environment specific HelmfileRule
+		envHemlfileRule, err := LoadHelmfilePromote(envHelmfileRulePath)
+		if err != nil {
+			return errors.Wrapf(err, "failed load %s", envHelmfileRulePath)
+		}
+		config.Spec.HelmfileRule.KeepOldVersions = envHemlfileRule.Spec.KeepOldVersions
+	}
+
+	err = modifyHelmfile(r, rule, filepath.Join(r.Dir, rule.Path), rule.Namespace)
 	if err != nil {
 		return errors.Wrapf(err, "failed to modify chart files in dir %s", r.Dir)
 	}
@@ -118,16 +135,20 @@ func modifyHelmfileApps(r *rules.PromoteRule, helmfile *state.HelmState, promote
 
 	isRemoteEnv := r.DevEnvContext.DevEnv.Spec.RemoteCluster
 
-	keepOldReleases := r.Config.Spec.HelmfileRule.KeepOldReleases || contains(r.Config.Spec.HelmfileRule.KeepOldVersions, details.Name)
+	keepOldVersions := contains(r.Config.Spec.HelmfileRule.KeepOldVersions, details.Name)
 
 	if nestedHelmfile {
-		// for nested helmfiles we assume we don't need to specify a namespace on each chart
-		// as all the charts will use the same namespace
-		if promoteNs != "" && helmfile.OverrideNamespace == "" {
-			helmfile.OverrideNamespace = promoteNs
+		if len(helmfile.Releases) == 0 {
+			// for nested helmfiles when adding the first release, set it up as the override
+			// then when future releases are added they can omit the namespace if their namespace matches this override
+			// if different namespaces are required for releases, manual edits should be done to
+			// set the namespace of EVERY release and make OverrideNamespace blank
+			if promoteNs != "" && helmfile.OverrideNamespace == "" {
+				helmfile.OverrideNamespace = promoteNs
+			}
 		}
 		found := false
-		if !keepOldReleases {
+		if !keepOldVersions {
 			for i := range helmfile.Releases {
 				release := &helmfile.Releases[i]
 				if release.Name == app || release.Name == details.Name {
@@ -143,7 +164,7 @@ func modifyHelmfileApps(r *rules.PromoteRule, helmfile *state.HelmState, promote
 				ns = promoteNs
 			}
 			newReleaseName := details.LocalName
-			if keepOldReleases {
+			if keepOldVersions {
 				newReleaseName = fmt.Sprintf("%s-%s", details.LocalName, version)
 			}
 			helmfile.Releases = append(helmfile.Releases, state.ReleaseSpec{
@@ -156,7 +177,7 @@ func modifyHelmfileApps(r *rules.PromoteRule, helmfile *state.HelmState, promote
 		return nil
 	}
 	found := false
-	if !keepOldReleases {
+	if !keepOldVersions {
 		for i := range helmfile.Releases {
 			release := &helmfile.Releases[i]
 			if (release.Name == app || release.Name == details.Name) && (release.Namespace == promoteNs || isRemoteEnv) {
@@ -169,7 +190,7 @@ func modifyHelmfileApps(r *rules.PromoteRule, helmfile *state.HelmState, promote
 
 	if !found {
 		newReleaseName := details.LocalName
-		if keepOldReleases {
+		if keepOldVersions {
 			newReleaseName = fmt.Sprintf("%s-%s", details.LocalName, version)
 		}
 		helmfile.Releases = append(helmfile.Releases, state.ReleaseSpec{
@@ -237,3 +258,30 @@ func contains(arr []string, str string) bool {
 	}
 	return false
 }
+
+// HelmfilePromote is for configuring promotion for an environment
+type HelmfilePromote struct {
+	metav1.TypeMeta `json:",inline"`
+
+	Spec HelmfilePromoteSpec `json:"spec"`
+}
+
+// HelmfilePromoteSpec defines the configuration for an environment
+type HelmfilePromoteSpec struct {
+	// keepOldVersions if specified is a list of release names and if the release name is in this list then the old versions are kept
+	KeepOldVersions []string `json:"keepOldVersions,omitempty"`
+}
+
+// LoadHelmfilePromote loads a HelmfilePromote from a specific YAML file
+func LoadHelmfilePromote(fileName string) (*HelmfilePromote, error) {
+	data, err := ioutil.ReadFile(fileName)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read file %s", fileName)
+	}
+	config := &HelmfilePromote{}
+	err = kyaml.Unmarshal(data, config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal YAML file %s due to %s", fileName, err)
+	}
+	return config, nil
+}