Add support for Argocd-Vault-Plugin together with Helm-values writeback

Signed-off-by: Arnaud van Gelder <arnaud.vangelder@fivetran.com>

Author: fivetran-arnaudvangelder

pkg/argocd/argocd.go

@@ -527,6 +527,10 @@ func getApplicationType(app *v1alpha1.Application) ApplicationType {
 		return ApplicationTypeKustomize
 	} else if sourceType == v1alpha1.ApplicationSourceTypeHelm {
 		return ApplicationTypeHelm
+	} else if st, set := app.Annotations[common.WriteBackTargetAnnotation]; set &&
+		strings.HasPrefix(st, common.HelmPrefix) &&
+		sourceType == v1alpha1.ApplicationSourceTypePlugin {
+		return ApplicationTypeHelm
 	} else {
 		return ApplicationTypeUnsupported
 	}

pkg/argocd/git.go

@@ -8,8 +8,10 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 	"text/template"
 
+	"helm.sh/helm/pkg/chartutil"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
@@ -297,6 +299,62 @@ func writeOverrides(app *v1alpha1.Application, wbc *WriteBackConfig, gitC git.Cl
 
 var _ changeWriter = writeOverrides
 
+// writeHelm writes any changes required for updating one or more images to a values.yaml
+func writeHelm(app *v1alpha1.Application, wbc *WriteBackConfig, gitC git.Client) (err error, skip bool) {
+	logCtx := log.WithContext().AddField("application", app.GetName())
+
+	fileName := filepath.Join(gitC.Root(), wbc.HelmBase)
+
+	logCtx.Infof("updating valuesfile %s", fileName)
+
+	valuesFile, err := chartutil.ReadValuesFile(fileName)
+	if err != nil {
+		panic(err)
+	}
+
+	// As we've defined the ApplicationSourceTypePlugin combined with WriteBackTargetAnnotation starting with Helm
+	// it is actually safe to use app.Spec.Source.Helm.Parameters for updating values.yaml
+	parameters := app.Spec.Source.Helm.Parameters
+
+	// Update all image tag and image repository values
+	for _, parameter := range parameters {
+		fullYamlPath := strings.Split(parameter.Name, ".")
+		yamlPath := strings.Join(fullYamlPath[0:len(fullYamlPath)-1], ".") // remove the last path to be able to update the value of it later on
+
+		image, err := valuesFile.Table(yamlPath)
+		if err != nil {
+			logCtx.Errorf("could not find path %s", yamlPath)
+		}
+
+		valuePath := fullYamlPath[len(fullYamlPath)-1]
+		image[valuePath] = parameter.Value
+	}
+
+	// Save the valuesfile back to the original file; first truncate the file and write back the content
+	newValuesFile, err := os.OpenFile(fileName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		logCtx.Errorf("Cannot open file %s to write values to", fileName)
+		return err, false
+	}
+	defer newValuesFile.Close()
+
+	err = newValuesFile.Truncate(0)
+	if err != nil {
+		logCtx.Errorf("Cannot truncate valuesfile %s", fileName)
+		return err, false
+	}
+
+	err = valuesFile.Encode(newValuesFile)
+	if err != nil {
+		logCtx.Errorf("Unable to write data into the valuesfile %s", fileName)
+		return err, false
+	}
+
+	return nil, false
+}
+
+var _ changeWriter = writeHelm
+
 // writeKustomization writes any changes required for updating one or more images to a kustomization.yml
 func writeKustomization(app *v1alpha1.Application, wbc *WriteBackConfig, gitC git.Client) (err error, skip bool) {
 	logCtx := log.WithContext().AddField("application", app.GetName())

pkg/argocd/update.go

@@ -69,6 +69,7 @@ type WriteBackConfig struct {
 	GitCommitEmail   string
 	GitCommitMessage string
 	KustomizeBase    string
+	HelmBase         string
 	Target           string
 	GitRepo          string
 }
@@ -488,6 +489,9 @@ func getWriteBackConfig(app *v1alpha1.Application, kubeClient *kube.KubernetesCl
 		if target, ok := app.Annotations[common.WriteBackTargetAnnotation]; ok && strings.HasPrefix(target, common.KustomizationPrefix) {
 			wbc.KustomizeBase = parseTarget(target, app.Spec.Source.Path)
 		}
+		if target, ok := app.Annotations[common.WriteBackTargetAnnotation]; ok && strings.HasPrefix(target, common.HelmPrefix) {
+			wbc.HelmBase = parseHelmTarget(target, app.Spec.Source.Path)
+		}
 		if err := parseGitConfig(app, kubeClient, wbc, creds); err != nil {
 			return nil, err
 		}
@@ -514,6 +518,17 @@ func parseTarget(target string, sourcePath string) (kustomizeBase string) {
 	}
 }
 
+// parseHelmTarget is a temporary function to avoid slice-out-of-bounds errors when common.KustomizationPrefix isn't set
+func parseHelmTarget(target string, sourcePath string) (kustomizeBase string) {
+	if target == common.HelmPrefix {
+		return filepath.Join(sourcePath, common.DefaultHelmTargetFile)
+	} else if base := target[len(common.HelmPrefix)+1:]; strings.HasPrefix(base, "/") {
+		return base[1:]
+	} else {
+		return filepath.Join(sourcePath, base)
+	}
+}
+
 func parseGitConfig(app *v1alpha1.Application, kubeClient *kube.KubernetesClient, wbc *WriteBackConfig, creds string) error {
 	branch, ok := app.Annotations[common.GitBranchAnnotation]
 	if ok {
@@ -565,6 +580,8 @@ func commitChanges(app *v1alpha1.Application, wbc *WriteBackConfig, changeList [
 		// if the kustomize base is set, the target is a kustomization
 		if wbc.KustomizeBase != "" {
 			return commitChangesGit(app, wbc, changeList, writeKustomization)
+		} else if wbc.HelmBase != "" {
+			return commitChangesGit(app, wbc, changeList, writeHelm)
 		}
 		return commitChangesGit(app, wbc, changeList, writeOverrides)
 	default:

pkg/common/constants.go

@@ -53,11 +53,15 @@ const (
 	GitRepositoryAnnotation   = ImageUpdaterAnnotationPrefix + "/git-repository"
 	WriteBackTargetAnnotation = ImageUpdaterAnnotationPrefix + "/write-back-target"
 	KustomizationPrefix       = "kustomization"
+	HelmPrefix                = "helm"
 )
 
 // DefaultTargetFilePattern configurations related to the write-back functionality
 const DefaultTargetFilePattern = ".argocd-source-%s.yaml"
 
+// DefaultHelmTargetFile configurations related to the write-back using helm functionality
+const DefaultHelmTargetFile = "values.yaml"
+
 // The default Git commit message's template
 const DefaultGitCommitMessage = `build: automatic update of {{ .AppName }}