Merge pull request #900 from piyush1594/iss_kompose_down

Added Case for Config Map in kompose down
kubernetes · Jan 4, 2018 · 6b7ba44 · 6b7ba44
2 parents d19d7a6 + 52f8f1f
commit 6b7ba44
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go
@@ -177,7 +177,8 @@ func (k *Kubernetes) InitConfigMap(name string, service kobject.ServiceConfig, o
 			APIVersion: "v1",
 		},
 		ObjectMeta: api.ObjectMeta{
-			Name: name + "-" + envName,
+			Name:   name + "-" + envName,
+			Labels: transformer.ConfigLabels(name + "-" + envName),
 		},
 		Data: envs,
 	}
@@ -1066,6 +1067,24 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
 					log.Infof("Successfully deleted Pod: %s", t.Name)
 				}
 			}
+
+		case *api.ConfigMap:
+			// delete ConfigMap
+			configMap, err := client.ConfigMaps(namespace).List(options)
+			if err != nil {
+				errorList = append(errorList, err)
+				break
+			}
+			for _, l := range configMap.Items {
+				if reflect.DeepEqual(l.Labels, komposeLabel) {
+					err = client.ConfigMaps(namespace).Delete(t.Name)
+					if err != nil {
+						errorList = append(errorList, err)
+						break
+					}
+					log.Infof("Successfully deleted ConfigMap: %s", t.Name)
+				}
+			}
 		}
 	}
 

diff --git a/script/test/fixtures/configmap/output-k8s-template.json b/script/test/fixtures/configmap/output-k8s-template.json
@@ -113,7 +113,10 @@
       "apiVersion": "v1",
       "metadata": {
         "name": "redis-foo-env",
-        "creationTimestamp": null
+        "creationTimestamp": null,
+	"labels": {
+          "io.kompose.service": "redis-foo-env"
+        }
       },
       "data": {
         "ALLOW_EMPTY_PASSWORD": "yes"
@@ -124,7 +127,10 @@
       "apiVersion": "v1",
       "metadata": {
         "name": "redis-bar-env",
-        "creationTimestamp": null
+        "creationTimestamp": null,
+	"labels": {
+          "io.kompose.service": "redis-bar-env"
+        }
       },
       "data": {
         "BAR": "FOO",