From e1e62b785e2fb3f6b39c7e911781eb0362fe3b4a Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Tue, 13 Nov 2018 13:01:51 +0000
Subject: [PATCH] Bump to kubeyaml 0.5.1 to fix (F)HR updating

kubeyaml 0.5.1 has a fix for updating images that include ports in
(Flux)HelmRelease manifests. So: bump that in the Dockerfile and shim
(`/bin/kubeyaml`), and add a test that it does account for such images
when updating.

Side issue in update_test.go: calling `t.Parallel()` _before_ invoking
the test case meant that the closed-over loop variable could be
reassigned before the test case was run.
---
 bin/kubeyaml                      |  2 +-
 cluster/kubernetes/update_test.go | 66 +++++++++++++++++++++++++++----
 docker/Dockerfile.flux            |  2 +-
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/bin/kubeyaml b/bin/kubeyaml
index 5315166d7..03d7f4c39 100755
--- a/bin/kubeyaml
+++ b/bin/kubeyaml
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker run --rm -i quay.io/squaremo/kubeyaml:0.5.0 "$@"
+docker run --rm -i quay.io/squaremo/kubeyaml:0.5.1 "$@"
diff --git a/cluster/kubernetes/update_test.go b/cluster/kubernetes/update_test.go
index 48b727d2e..ae2d3ebe3 100644
--- a/cluster/kubernetes/update_test.go
+++ b/cluster/kubernetes/update_test.go
@@ -49,13 +49,14 @@ func TestUpdates(t *testing.T) {
 		{"single quotes", case8resource, case8containers, case8image, case8, case8out},
 		{"in multidoc", case9resource, case9containers, case9image, case9, case9out},
 		{"in kubernetes List resource", case10resource, case10containers, case10image, case10, case10out},
-		{"FluxHelmRelease (simple image encoding)", case11resource, case11containers, case11image, case11, case11out},
-		{"FluxHelmRelease (multi image encoding)", case12resource, case12containers, case12image, case12, case12out},
-		{"initContainer", case13resource, case13containers, case13image, case13, case13out},
+		{"FluxHelmRelease (v1alpha2; simple image encoding)", case11resource, case11containers, case11image, case11, case11out},
+		{"FluxHelmRelease (v1alpha2; multi image encoding)", case12resource, case12containers, case12image, case12, case12out},
+		{"HelmRelease (v1beta1; image with port number)", case13resource, case13containers, case13image, case13, case13out},
+		{"initContainer", case14resource, case14containers, case14image, case14, case14out},
 	} {
 		t.Run(c.name, func(t *testing.T) {
-			t.Parallel()
 			testUpdate(t, c)
+			t.Parallel()
 		})
 	}
 }
@@ -872,6 +873,55 @@ spec:
 `
 
 const case13 = `---
+apiVersion: flux.weave.works/v1beta1
+kind: HelmRelease
+metadata:
+  name: mariadb
+  namespace: maria
+spec:
+  chart:
+    repository: https://example.com/charts
+    name: mariadb
+    version: 1.1.2
+  values:
+    mariadb:
+      image: localhost:5000/mariadb
+      tag: 10.1.30-r1
+      persistence:
+        enabled: false
+    workProperly: true
+    sidecar:
+      image: sidecar:v1
+`
+
+const case13resource = "maria:helmrelease/mariadb"
+const case13image = "localhost:5000/mariadb:10.1.33"
+
+var case13containers = []string{"mariadb"}
+
+const case13out = `---
+apiVersion: flux.weave.works/v1beta1
+kind: HelmRelease
+metadata:
+  name: mariadb
+  namespace: maria
+spec:
+  chart:
+    repository: https://example.com/charts
+    name: mariadb
+    version: 1.1.2
+  values:
+    mariadb:
+      image: localhost:5000/mariadb
+      tag: 10.1.33
+      persistence:
+        enabled: false
+    workProperly: true
+    sidecar:
+      image: sidecar:v1
+`
+
+const case14 = `---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -888,12 +938,12 @@ spec:
         image: 'weaveworks/weave-kube:2.2.0'
 `
 
-const case13resource = "default:deployment/weave"
-const case13image = "weaveworks/weave-kube:2.2.1"
+const case14resource = "default:deployment/weave"
+const case14image = "weaveworks/weave-kube:2.2.1"
 
-var case13containers = []string{"weave"}
+var case14containers = []string{"weave"}
 
-const case13out = `---
+const case14out = `---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
index 8651c6821..54d720b2e 100644
--- a/docker/Dockerfile.flux
+++ b/docker/Dockerfile.flux
@@ -34,7 +34,7 @@ LABEL maintainer="Weaveworks <help@weave.works>" \
 ENTRYPOINT [ "/sbin/tini", "--", "fluxd" ]
 
 # Get the kubeyaml binary (files) and put them on the path
-COPY --from=quay.io/squaremo/kubeyaml:0.5.0 /usr/lib/kubeyaml /usr/lib/kubeyaml/
+COPY --from=quay.io/squaremo/kubeyaml:0.5.1 /usr/lib/kubeyaml /usr/lib/kubeyaml/
 ENV PATH=/bin:/usr/bin:/usr/local/bin:/usr/lib/kubeyaml
 
 COPY ./kubeconfig /root/.kube/config