Add labels from CRD source

Author: sf1tzp

examples/operator/templates/cephvolume-crd.yaml

@@ -4,8 +4,8 @@ metadata:
   name: cephvolumes.test.example.com
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
-    controller-gen.kubebuilder.io/version: v0.7.0
   labels:
+    example-label: my-app
   {{- include "operator.labels" . | nindent 4 }}
 spec:
   group: test.example.com

examples/operator/templates/manifestcephvolume-crd.yaml

@@ -4,8 +4,8 @@ metadata:
   name: manifestcephvolumes.test.example.com
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
-    controller-gen.kubebuilder.io/version: v0.7.0
   labels:
+
   {{- include "operator.labels" . | nindent 4 }}
 spec:
   conversion:

pkg/processor/crd/crd.go

@@ -23,8 +23,8 @@ metadata:
   name: %[1]s
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "%[2]s.fullname" . }}-%[4]s
-    controller-gen.kubebuilder.io/version: v0.7.0
   labels:
+%[5]s
   {{- include "%[2]s.labels" . | nindent 4 }}
 spec:
 %[3]s
@@ -82,11 +82,20 @@ func (c crd) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
 		}
 	}
 
-	versions, _ := yaml.Marshal(spec)
-	versions = yamlformat.Indent(versions, 2)
-	versions = bytes.TrimRight(versions, "\n ")
+	specYaml, _ := yaml.Marshal(spec)
+	specYaml = yamlformat.Indent(specYaml, 2)
+	specYaml = bytes.TrimRight(specYaml, "\n ")
 
-	res := fmt.Sprintf(crdTeml, obj.GetName(), appMeta.ChartName(), string(versions), certName)
+	labels := obj.GetLabels()
+	var labelsYaml []byte
+
+	if len(labels) > 0 {
+		labelsYaml, _ = yaml.Marshal(labels)
+		labelsYaml = yamlformat.Indent(labelsYaml, 4)
+		labelsYaml = bytes.TrimRight(labelsYaml, "\n ")
+	}
+
+	res := fmt.Sprintf(crdTeml, obj.GetName(), appMeta.ChartName(), string(specYaml), certName, string(labelsYaml))
 	name, _, err := unstructured.NestedString(obj.Object, "spec", "names", "singular")
 	if err != nil || !ok {
 		return true, nil, errors.Wrap(err, "unable to create crd template")

pkg/processor/crd/crd_test.go

@@ -15,9 +15,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: my-operator-system/my-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: cephvolumes.test.example.com
+  labels:
+    example: true
 spec:
   group: test.example.com
   names:

test_data/k8s-operator-kustomize.output

@@ -10,9 +10,10 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: my-operator-system/operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: cephvolumes.test.example.com
+  labels:
+    example-label: my-app 
 spec:
   group: test.example.com
   names:
@@ -230,7 +231,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: my-operator-system/operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: manifestcephvolumes.test.example.com
 spec: