From 1672a01e494653e2313c7185eadafed84ce1fdae Mon Sep 17 00:00:00 2001
From: Maartje Eyskens <maartje@eyskens.me>
Date: Thu, 13 Aug 2020 20:09:35 +0200
Subject: [PATCH] Remove managed by Helm labels from static manifests and CRDs

Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
---
 deploy/manifests/BUILD.bazel | 40 ++++++++++++++++++++++++++++++++++--
 hack/filter-crd/main.go      |  6 ++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/deploy/manifests/BUILD.bazel b/deploy/manifests/BUILD.bazel
index 51652bd91..95b47dc3f 100644
--- a/deploy/manifests/BUILD.bazel
+++ b/deploy/manifests/BUILD.bazel
@@ -25,6 +25,24 @@ VARIANTS = {
     },
 }
 
+[genrule(
+    name = "%s.nohelm.crds.yaml" % name,
+    srcs = [
+        "//deploy/crds:crds.%s" % meta["crd_variant"],
+    ],
+    outs = ["%s.crds.nohelm.out" % name],
+    cmd = " ".join([
+        "$(location //hack/filter-crd)",
+        "-variant=no-helm",
+        "$(location //deploy/crds:crds.%s)" % meta["crd_variant"],
+        "> $@",
+    ]),
+    tools = [
+        "//hack/filter-crd",
+    ],
+    visibility = ["//visibility:public"],
+) for (name, meta) in VARIANTS.items()]
+
 [helm_tmpl(
     name = "%s.manifests" % name,
     helm_pkg = "//deploy/charts/cert-manager",
@@ -35,7 +53,7 @@ VARIANTS = {
 
 [licensed_file(
     name = "%s.crds.yaml" % name,
-    src = "//deploy/crds:crds.%s" % meta["crd_variant"],
+    src = ":%s.nohelm.crds.yaml" % name,
 ) for (name, meta) in VARIANTS.items()]
 
 [genrule(
@@ -55,9 +73,27 @@ VARIANTS = {
     ]),
 ) for (name, meta) in VARIANTS.items()]
 
+[genrule(
+    name = "%s.unlicensed.nohelm" % name,
+    srcs = [
+        ":%s.unlicensed" % name,
+    ],
+    outs = ["%s.unlicensed.nohelm.yaml" % name],
+    cmd = " ".join([
+        "$(location //hack/filter-crd)",
+        "-variant=no-helm",
+        "$(location :%s.unlicensed)" % name,
+        "> $@",
+    ]),
+    tools = [
+        "//hack/filter-crd",
+    ],
+    visibility = ["//visibility:public"],
+) for (name, meta) in VARIANTS.items()]
+
 [licensed_file(
     name = "%s.yaml" % name,
-    src = "%s.unlicensed" % name,
+    src = "%s.unlicensed.nohelm" % name,
 ) for (name, meta) in VARIANTS.items()]
 
 pkg_tar(
diff --git a/hack/filter-crd/main.go b/hack/filter-crd/main.go
index 6ddb00b8c..ac2692d60 100644
--- a/hack/filter-crd/main.go
+++ b/hack/filter-crd/main.go
@@ -89,6 +89,7 @@ func main() {
 		}
 
 		output = append(output, string(fileOut))
+		d = map[interface{}]interface{}{} // clean out the old, otherwise the decoder will merge keys
 	}
 
 	fmt.Println(strings.Join(output, "---\n"))
@@ -190,5 +191,10 @@ func loadVariant() {
 		}
 
 		singleCRDVersion = true
+	} else if variant == "no-helm" {
+		removeKeys = []string{
+			"metadata/labels/app.kubernetes.io/managed-by",
+			"metadata/labels/helm.sh/chart",
+		}
 	}
 }