fix: Helmfile promote config 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>

go.sum

@@ -761,6 +761,7 @@ github.com/jenkins-x/jx-api/v4 v4.0.23 h1:GpgytvBXbHVGaeqsRLGl9f1v8vpxMsTWlZNPyh
 github.com/jenkins-x/jx-api/v4 v4.0.23/go.mod h1:IC88X+24Nmexuj7lRNRgzfrchzlo0qysfwkICpqDmMQ=
 github.com/jenkins-x/jx-gitops v0.0.530 h1:qIPmrZrg8McYFEMYn0cNfqVKYr78gAxN1LAeFxZdUDk=
 github.com/jenkins-x/jx-gitops v0.0.530/go.mod h1:GONXzTOpVG0e51/clom1j8MdOWHBhh67NvboIzfbANI=
+github.com/jenkins-x/jx-gitops v0.0.531 h1:0UEuvAf40TBmA3lQOWJ4iFUP8re/qygs17Pgpc69+yM=
 github.com/jenkins-x/jx-gitops v0.0.531/go.mod h1:GONXzTOpVG0e51/clom1j8MdOWHBhh67NvboIzfbANI=
 github.com/jenkins-x/jx-helpers/v3 v3.0.64 h1:2tKXtb3B20hZzB+pnhptU/Zb5HzFm2G4/CJLZLZRnTE=
 github.com/jenkins-x/jx-helpers/v3 v3.0.64/go.mod h1:J3nlpCzSkrVayft16okG3bX9BtWdC7sFWBseKUyC+F8=

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-nested-explicit-keep-old-releases/helmfiles/jx/helmfile.yaml.1.expected → pkg/rules/factory/test_data/helmfile-per-env-keep-old-version/helmfiles/jx/helmfile.yaml.1.expected

@@ -6,6 +6,6 @@ repositories:
 releases:
 - chart: dev/myapp
   version: 1.2.3
-  name: myapp-1-2-3
+  name: myapp-1.2.3
 templates: {}
 renderedvalues: {}

pkg/rules/factory/test_data/helmfile-nested-explicit-keep-old-versions/helmfiles/jx/helmfile.yaml.2.expected → pkg/rules/factory/test_data/helmfile-per-env-keep-old-version/helmfiles/jx/helmfile.yaml.2.expected

@@ -6,9 +6,9 @@ repositories:
 releases:
 - chart: dev/myapp
   version: 1.2.3
-  name: myapp-1-2-3
+  name: myapp-1.2.3
 - chart: dev/myapp
   version: 1.2.4
-  name: myapp-1-2-4
+  name: myapp-1.2.4
 templates: {}
 renderedvalues: {}

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