Update vendoring

rachfop · Oct 10, 2017 · 28601fa · 28601fa
1 parent f4bfe1f
commit 28601fa
Show file tree

Hide file tree

Showing 16 changed files with 1,056 additions and 77 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -20,6 +20,7 @@ import:
 - package: github.com/spf13/cobra
 - package: github.com/spf13/viper
 - package: github.com/pkg/errors
+- package: github.com/joho/godotenv
 
 # We use libcompose to parse v1 and v2 of Docker Compose
 - package: github.com/docker/libcompose

diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go
@@ -177,7 +177,7 @@ func (k *Kubernetes) InitConfigMap(name string, service kobject.ServiceConfig, o
 			APIVersion: "v1",
 		},
 		ObjectMeta: api.ObjectMeta{
-			Name: envName,
+			Name: name + "-" + envName,
 		},
 		Data: envs,
 	}
@@ -530,7 +530,7 @@ func (k *Kubernetes) ConfigEnvs(name string, service kobject.ServiceConfig, opt
 					ValueFrom: &api.EnvVarSource{
 						ConfigMapKeyRef: &api.ConfigMapKeySelector{
 							LocalObjectReference: api.LocalObjectReference{
-								Name: envName,
+								Name: name + "-" + envName,
 							},
 							Key: k,
 						}},

diff --git a/script/test/fixtures/configmap/output-k8s-template.json b/script/test/fixtures/configmap/output-k8s-template.json
@@ -74,7 +74,7 @@
                     "name": "ALLOW_EMPTY_PASSWORD",
                     "valueFrom": {
                       "configMapKeyRef": {
-                        "name": "foo-env",
+                        "name": "redis-foo-env",
                         "key": "ALLOW_EMPTY_PASSWORD"
                       }
                     }
@@ -83,7 +83,7 @@
                     "name": "BAR",
                     "valueFrom": {
                       "configMapKeyRef": {
-                        "name": "bar-env",
+                        "name": "redis-bar-env",
                         "key": "BAR"
                       }
                     }
@@ -92,7 +92,7 @@
                     "name": "FOO",
                     "valueFrom": {
                       "configMapKeyRef": {
-                        "name": "bar-env",
+                        "name": "redis-bar-env",
                         "key": "FOO"
                       }
                     }
@@ -112,7 +112,7 @@
       "kind": "ConfigMap",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo-env",
+        "name": "redis-foo-env",
         "creationTimestamp": null
       },
       "data": {
@@ -123,7 +123,7 @@
       "kind": "ConfigMap",
       "apiVersion": "v1",
       "metadata": {
-        "name": "bar-env",
+        "name": "redis-bar-env",
         "creationTimestamp": null
       },
       "data": {

diff --git a/vendor/github.com/joho/godotenv/LICENCE b/vendor/github.com/joho/godotenv/LICENCE