Merge pull request #2249 from fluxcd/feature/helmrelease-image-pattern

Support defining image paths for HelmReleases

bin/kubeyaml

@@ -1,2 +1,2 @@
 #!/bin/sh
-docker run --rm -i quay.io/squaremo/kubeyaml:0.6.1 "$@"
+docker run --rm -i quay.io/squaremo/kubeyaml:0.7.0 "$@"

cluster/kubernetes/errors.go

@@ -17,15 +17,16 @@ perhaps verify its presence using kubectl.
 `, obj)}
 }
 
-func UpdateNotSupportedError(kind string) error {
+func UpdateNotSupportedError(kind string) *fluxerr.Error {
 	return &fluxerr.Error{
 		Type: fluxerr.User,
 		Err:  fmt.Errorf("updating resource kind %q not supported", kind),
 		Help: `Flux does not support updating ` + kind + ` resources.
 
-This may be because those resources do not use images, or because it
-is a new kind of resource in Kubernetes, and Flux does not support it
-yet.
+This may be because those resources do not use images, you are trying
+to use a YAML dot notation path annotation for a non HelmRelease
+resource, or because it is a new kind of resource in Kubernetes, and
+Flux does not support it yet.
 
 If you can use a Deployment instead, Flux can work with
 those. Otherwise, you may have to update the resource manually (e.g.,

cluster/kubernetes/kubeyaml.go

@@ -26,6 +26,13 @@ func (k KubeYAML) Annotate(in []byte, ns, kind, name string, policies ...string)
 	return execKubeyaml(in, args)
 }
 
+// Set calls the kubeyaml subcommand `set` with the arguments given.
+func (k KubeYAML) Set(in []byte, ns, kind, name string, values ...string) ([]byte, error) {
+	args := []string{"set", "--namespace", ns, "--kind", kind, "--name", name}
+	args = append(args, values...)
+	return execKubeyaml(in, args)
+}
+
 func execKubeyaml(in []byte, args []string) ([]byte, error) {
 	cmd := exec.Command("kubeyaml", args...)
 	out := &bytes.Buffer{}

cluster/kubernetes/manifests.go

@@ -133,7 +133,32 @@ func (m *manifests) ParseManifest(def []byte, source string) (map[string]resourc
 }
 
 func (m *manifests) SetWorkloadContainerImage(def []byte, id resource.ID, container string, image image.Ref) ([]byte, error) {
-	return updateWorkload(def, id, container, image)
+	resources, err := m.ParseManifest(def, "stdin")
+	if err != nil {
+		return nil, err
+	}
+	res, ok := resources[id.String()]
+	if !ok {
+		return nil, fmt.Errorf("resource %s not found", id.String())
+	}
+	// Check if the workload is a HelmRelease, and try to resolve an image
+	// map for the given container to perform an update based on mapped YAML
+	// dot notation paths. If resolving the map fails (either because there
+	// is no map for the given container, or the mapping does not resolve
+	// in to a valid image ref), it returns the error.
+	//
+	// NB: we do this here and not in e.g. the `resource` package, to ensure
+	// everything _outside_ this package only knows about Kubernetes native
+	// containers, and not the dot notation YAML paths we invented for custom
+	// Helm value structures.
+	if hr, ok := res.(*kresource.HelmRelease); ok {
+		paths, err := hr.GetContainerImageMap(container)
+		if err != nil {
+			return nil, err
+		}
+		return updateWorkloadImagePaths(def, id, paths, image)
+	}
+	return updateWorkloadContainer(def, id, container, image)
 }
 
 func (m *manifests) CreateManifestPatch(originalManifests, modifiedManifests []byte, originalSource, modifiedSource string) ([]byte, error) {

cluster/kubernetes/policies_test.go

@@ -168,6 +168,14 @@ func TestUpdatePolicies(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "add tag policy with alternative prefix does not change existing prefix",
+			in: []string{"filter.fluxcd.io/nginx", "glob:*"},
+			out: []string{"filter.fluxcd.io/nginx", "glob:*"},
+			update: resource.PolicyUpdate{
+				Add: policy.Set{policy.TagPrefix("nginx"): "glob:*"},
+			},
+		},
 		{
 			name: "set tag to all containers",
 			in:   nil,