Adding save command to annotation

This command will add `kompose command` used to generate artifacts as well as `kompose version`, for ex, ``` metadata: annotations: kompose.cmd: kompose convert -f /home/snarwade --stdout kompose.version: 1.0.0 (HEAD) ``` For functional test, Now each test has template like, ``` "annotations": { "kompose.cmd": "%CMD%", "kompose.version": "%VERSION%" ``` Because, for every machine these values will be different. Updated functional test with new annotations
kubernetes · Aug 11, 2017 · ffe2c0e · ffe2c0e
1 parent a9bffa6
commit ffe2c0e
Show file tree

Hide file tree

Showing 56 changed files with 1,760 additions and 84 deletions.
diff --git a/pkg/transformer/kubernetes/kubernetes_test.go b/pkg/transformer/kubernetes/kubernetes_test.go
@@ -196,9 +196,7 @@ func checkMeta(config kobject.ServiceConfig, meta api.ObjectMeta, expectedName s
 	if expectedName != meta.Name {
 		return fmt.Errorf("Found unexpected name: %s vs. %s", expectedName, meta.Name)
 	}
-	if !equalStringMaps(config.Annotations, meta.Annotations) {
-		return fmt.Errorf("Found different annotations: %#v vs. %#v", config.Annotations, meta.Annotations)
-	}
+
 	if shouldSetLabels != (len(meta.Labels) > 0) {
 		return fmt.Errorf("Unexpected labels: %#v", meta.Labels)
 	}

diff --git a/pkg/transformer/utils.go b/pkg/transformer/utils.go
@@ -20,15 +20,17 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path"
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/kubernetes/kompose/pkg/kobject"
 
-	"github.com/kubernetes/kompose/pkg/utils/docker"
 	"path/filepath"
 
+	"github.com/kubernetes/kompose/pkg/utils/docker"
+
 	"github.com/pkg/errors"
 	"k8s.io/kubernetes/pkg/api"
 )
@@ -114,7 +116,14 @@ func ConfigAnnotations(service kobject.ServiceConfig) map[string]string {
 	for key, value := range service.Annotations {
 		annotations[key] = value
 	}
+	annotations["kompose.cmd"] = strings.Join(os.Args, " ")
+	version := exec.Command("kompose", "version")
+	out, err := version.Output()
+	if err != nil {
+		errors.Wrap(err, "Failed to get kompose version")
 
+	}
+	annotations["kompose.version"] = strings.Trim(string(out), " \n")
 	return annotations
 }
 

diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh
diff --git a/script/test/fixtures/buildargs/output-os-template.json b/script/test/fixtures/buildargs/output-os-template.json
@@ -11,6 +11,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "foo"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -38,6 +42,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "foo1"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -65,6 +73,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "foo"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -155,6 +167,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "foo"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -205,6 +221,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "foo1"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -295,6 +315,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "foo1"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {

diff --git a/...fixtures/change-in-volume/output-k8s.json → ...change-in-volume/output-k8s-template.json b/...fixtures/change-in-volume/output-k8s.json → ...change-in-volume/output-k8s-template.json
@@ -11,6 +11,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "redis"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -38,6 +42,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "web"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -64,6 +72,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "redis"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -98,6 +110,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "web"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {

diff --git a/.../fixtures/change-in-volume/output-os.json → .../change-in-volume/output-os-template.json b/.../fixtures/change-in-volume/output-os.json → .../change-in-volume/output-os-template.json
@@ -11,6 +11,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "redis"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -38,6 +42,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "web"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -64,6 +72,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "redis"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -150,6 +162,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "web"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {

diff --git a/...xtures/entrypoint-command/output-k8s.json → ...trypoint-command/output-k8s-template.json b/...xtures/entrypoint-command/output-k8s.json → ...trypoint-command/output-k8s-template.json
@@ -11,6 +11,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "base"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -38,6 +42,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "base"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {

diff --git a/...ixtures/entrypoint-command/output-os.json → ...ntrypoint-command/output-os-template.json b/...ixtures/entrypoint-command/output-os.json → ...ntrypoint-command/output-os-template.json
@@ -11,6 +11,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "base"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {
@@ -38,6 +42,10 @@
         "creationTimestamp": null,
         "labels": {
           "io.kompose.service": "base"
+        },
+        "annotations": {
+          "kompose.cmd": "%CMD%",
+          "kompose.version": "%VERSION%"
         }
       },
       "spec": {