bug: fix annotation bug

#### What type of PR is this?

<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
-->

#### What this PR does / why we need it:

When supplying a label in the compose file, it should stay in the output
too.

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Fixes #1885

#### Special notes for your reviewer:

Signed-off-by: Charlie Drage <charlie@charliedrage.com>

pkg/transformer/utils.go

@@ -249,25 +249,24 @@ func ConfigAllLabels(name string, service *kobject.ServiceConfig) map[string]str
 func ConfigAnnotations(service kobject.ServiceConfig) map[string]string {
 	annotations := map[string]string{}
 
-	if !service.WithKomposeAnnotation {
-		return annotations
-	}
-
 	for key, value := range service.Annotations {
 		annotations[key] = value
 	}
 
-	annotations["kompose.cmd"] = strings.Join(os.Args, " ")
-	versionCmd := exec.Command("kompose", "version")
-	out, err := versionCmd.Output()
-	if err != nil {
-		errors.Wrap(err, "Failed to get kompose version")
-	}
-	annotations["kompose.version"] = strings.Trim(string(out), " \n")
+	// Only add these to annotations if service.WithKomposeAnnotation is true
+	if service.WithKomposeAnnotation {
+		annotations["kompose.cmd"] = strings.Join(os.Args, " ")
+		versionCmd := exec.Command("kompose", "version")
+		out, err := versionCmd.Output()
+		if err != nil {
+			errors.Wrap(err, "Failed to get kompose version")
+		}
+		annotations["kompose.version"] = strings.Trim(string(out), " \n")
 
-	// If the version is blank (couldn't retrieve the kompose version for whatever reason)
-	if annotations["kompose.version"] == "" {
-		annotations["kompose.version"] = version.VERSION + " (" + version.GITCOMMIT + ")"
+		// If the version is blank (couldn't retrieve the kompose version for whatever reason)
+		if annotations["kompose.version"] == "" {
+			annotations["kompose.version"] = version.VERSION + " (" + version.GITCOMMIT + ")"
+		}
 	}
 
 	return annotations

script/test/cmd/tests.sh

@@ -386,3 +386,8 @@ os_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/envvars-with-status/compos
 os_output="$KOMPOSE_ROOT/script/test/fixtures/envvars-with-status/output-os.yaml"
 convert::expect_success "$k8s_cmd" "$k8s_output" || exit 1
 convert::expect_success "$os_cmd" "$os_output" || exit 1
+
+# Test label in compose.yaml appears in the output annotation
+k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/label/compose.yaml convert --stdout --with-kompose-annotation=false"
+k8s_output="$KOMPOSE_ROOT/script/test/fixtures/label/output-k8s.yaml"
+convert::expect_success "$k8s_cmd" "$k8s_output" || exit 1