Add namespace to wide output (#76)

* add namespace to wide output * update functional tests for namespace output. make tests run on newer versions of kind
FairwindsOps · May 19, 2020 · abaad7e · abaad7e
1 parent 30ab948
commit abaad7e
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 29 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -66,9 +66,7 @@ workflows:
             branches:
               only: /.*/
       - rok8s-scripts/kubernetes_e2e_tests:
-          name: e2e test kube 1.15.7
-          kind_node_image: >-
-            "kindest/node:v1.15.7@sha256:e2df133f80ef633c53c0200114fce2ed5e1f6947477dbc83261a6a921169488d"
+          name: run functional tests
           <<: *e2e_config
       - release:
           filters:

diff --git a/e2e/tests/00_static_files.yaml b/e2e/tests/00_static_files.yaml
@@ -21,7 +21,7 @@ testcases:
 
 - name: helm template show all
   steps:
-  - script: helm template assets/helm3chart | pluto detect -t v1.16.0 -A -
+  - script: helm template assets/chart | pluto detect -t v1.16.0 -A -
     assertions:
     - result.code ShouldEqual 3
     - result.systemout ShouldContainSubstring "NAME                              KIND         VERSION              REPLACEMENT   REMOVED   DEPRECATED"
@@ -30,7 +30,7 @@ testcases:
 
 - name: helm template
   steps:
-  - script: helm template assets/helm3chart | pluto detect -
+  - script: helm template assets/chart | pluto detect -
     assertions:
     - result.systemout ShouldContainSubstring "NAME                              KIND         VERSION              REPLACEMENT   REMOVED   DEPRECATED"
     - result.systemout ShouldContainSubstring "RELEASE-NAME-helm3chart-v1beta1   Deployment   extensions/v1beta1   apps/v1       true      true"
@@ -77,5 +77,5 @@ testcases:
   - script: pluto detect-files -d assets/ -owide
     assertions:
     - result.code ShouldEqual 3
-    - result.systemout ShouldContainSubstring "NAME        KIND         VERSION              REPLACEMENT   DEPRECATED   DEPRECATED IN   REMOVED   REMOVED IN"
-    - result.systemout ShouldContainSubstring "utilities   Deployment   extensions/v1beta1   apps/v1       true         v1.9.0          true      v1.16.0"
+    - result.systemout ShouldContainSubstring "NAME        NAMESPACE   KIND         VERSION              REPLACEMENT   DEPRECATED   DEPRECATED IN   REMOVED   REMOVED IN"
+    - result.systemout ShouldContainSubstring "utilities   <UNKNOWN>   Deployment   extensions/v1beta1   apps/v1       true         v1.9.0          true      v1.16.0"
diff --git a/e2e/tests/01_helm-detect-3.yaml b/e2e/tests/01_helm-detect-3.yaml
@@ -1,9 +1,9 @@
 version: "2"
 name: "Static Code Files (including helm)"
 testcases:
-- name: install helm chart
+- name: install helm3 release secret
   steps:
-  - script: helm install test assets/helm3chart
+  - script: kubectl apply -f assets/helm3
     assertions:
     - result.code ShouldEqual 0
 
@@ -43,6 +43,14 @@ testcases:
     - result.systemout ShouldContainSubstring "test/test-helm3chart-v1beta1   Deployment   extensions/v1beta1   apps/v1       true      true"
     - result.systemout ShouldContainSubstring "test/test-helm3chart           Deployment   apps/v1                            false     false"
 
+- name: helm detect -owide
+  steps:
+  - script: pluto detect-helm --helm-version=3 -owide -t v1.16.0
+    assertions:
+    - result.code ShouldEqual 3
+    - result.systemout ShouldContainSubstring "NAME                           NAMESPACE   KIND         VERSION              REPLACEMENT   DEPRECATED   DEPRECATED IN   REMOVED   REMOVED IN"
+    - result.systemout ShouldContainSubstring "test/test-helm3chart-v1beta1   default     Deployment   extensions/v1beta1   apps/v1       true         v1.9.0          true      v1.16.0"
+
 - name: cleanup
   steps:
-  - script: helm delete test
+  - script: kubectl delete -f assets/helm3
diff --git a/e2e/tests/assets/helm3chart/.helmignore → e2e/tests/assets/chart/.helmignore b/e2e/tests/assets/helm3chart/.helmignore → e2e/tests/assets/chart/.helmignore
diff --git a/e2e/tests/assets/helm3chart/Chart.yaml → e2e/tests/assets/chart/Chart.yaml b/e2e/tests/assets/helm3chart/Chart.yaml → e2e/tests/assets/chart/Chart.yaml
diff --git a/...sts/assets/helm3chart/templates/NOTES.txt → e2e/tests/assets/chart/templates/NOTES.txt b/...sts/assets/helm3chart/templates/NOTES.txt → e2e/tests/assets/chart/templates/NOTES.txt
diff --git a/.../assets/helm3chart/templates/_helpers.tpl → ...tests/assets/chart/templates/_helpers.tpl b/.../assets/helm3chart/templates/_helpers.tpl → ...tests/assets/chart/templates/_helpers.tpl
diff --git a/...hart/templates/deployment-deprecated.yaml → ...hart/templates/deployment-deprecated.yaml b/...hart/templates/deployment-deprecated.yaml → ...hart/templates/deployment-deprecated.yaml
diff --git a/...sets/helm3chart/templates/deployment.yaml → ...ts/assets/chart/templates/deployment.yaml b/...sets/helm3chart/templates/deployment.yaml → ...ts/assets/chart/templates/deployment.yaml
diff --git a/e2e/tests/assets/helm3chart/values.yaml → e2e/tests/assets/chart/values.yaml b/e2e/tests/assets/helm3chart/values.yaml → e2e/tests/assets/chart/values.yaml
diff --git a/e2e/tests/assets/helm3/secret.yaml b/e2e/tests/assets/helm3/secret.yaml
@@ -0,0 +1,23 @@
+{
+    "apiVersion": "v1",
+    "data": {
+        "release": "H4sIAAAAAAAC/+x7W3OqSrf2X7H43otvVyWZgDEzWrUuhETEKImoHPrNW6vohgDaDSw5KM6a/31XN3g2h7n23LVvVqpSEWjGqUc/4xlt5wcXOcTjOlzmpRl3xYXRW8x1fnBv4TLN/nS9BMel53IdTuRF/ppvXQu3U4HvCM1O6/6m3eTFu/tr/q7D89wVh51ffsX1sJexwewiRcswycI44jqcGqWZg3EDxSShg7grLs2cLE+5DrdTcsVFcebRW8JNQ/GyRhZ4DSdJcIgcKqcx04cNWDaWeRSFkU8fpx4VSZzITTuvUaPhrZN4mTVenh/+1Lqjxz/+9f8XOfRQhhu+lzWS2E0b19c0SGniIK/hem9OjrPGNW68ck6S3NDRy8jLvPQmjL/RgX8EHiZNFDjL7Op8REj9ipD3B434K9e4jhvzNI4SJwv+eOV+3ISZR9J/8/+5IV7muE7m3FCZP1+5/2LWoiBuvHJGmIZZI8iypPPtmyB+v+Fv+Buhc8/f840sbuSp1yjjfHkYileOvr/17ZJLNA7Xb/Fy5Szdxr+2AWlQoZ17/jXifl5xzCuaIFvr6Oc6hfZuc1dc4S3TaiL5G+GGP5vebqPvYdJgwxtv8bLxtIsSd8U5SWjsBBQiu5Ps7wg3wh2TmZUJ1XzgJjUSx2jBdaIc4ysu80iCHZYj/z5I9vrmN+15+ji5ydbU5ModbjS59XXR4NW+HoOJFKC+lDqmFrgKLmAoGbPFyrejhY8iI4cE56CUeEcxNmAizaEoZLbZWqBN/OQ100xVMFHllmmbawFYo9wxWxEixgaVLQxJL4SKsVD7QluOsu/DiVTaZisCk+7CUdobV+7evUy6uUF6qWsamyHV1Rxg1Bzl7Hl/5L9Z/JMqS9+9kvcR6eVAnPnDSApcJdgwuWHXd/o6j/rZ98qW8UV5rrJm41GTjjNyIEvtt2lcDOm1rMewqfFDEhSoOfbfLOG7V3bzrfzKz/qdccJsAWbr0C8M+xpm+hWtgJEeOGZro8qDZyjqeKa0S1dW/SEGAewbGJWtDbAGomNqeBjpLaTMtn5iry8VKBr700X7UTfa46kwmL1MxrHTNEJgajyUpQhYY384EXLbFDBqSoEtzqiN/hAPMFSMAImzfEp6GbC0lW1qmNqpykKhKskGiq2Vbenxy2TwfRhpK2COckTt62tw1ONzSNoLYFAb9LYaSjs7UUnnQEog0VLX1LEqD2JgrrORqMW2NeCHBAhQWTOb1LCK3dM49lXFuGXyZel5yus9i8fjS/4wvdbo9/hFMA9MYWNuJHcYabxt6QIqWwFQ9BJY2gZYla+2qS9Yrjb5sLZ17ij3VT49xMWw1Hc2P4f1Z0F6meFxnftGisSZ75i2b4vt3FV6CYxGvrpYF7apy7a5DiDRMAq/MvddX6UxEvTecygNXFnKbGvhu0pvSdeoqgDsllLmmC3BVYyNqoAChXRdzvyp0g7A4yCASi+3RaNUH/FY7euFqgywqvRE28SpbQ5SMLmt9Wx/JQCbM98We7nadwNX0eIaEzau0uNda+RD0T7Bgm70P87FvibaZTdz/0ZODVZHOTXVjYE5mWnv5hVqgrkq8xk8soGu+dYEmGtsWxoeLloBNI0NUnpzMJHab5Nft4vqcBUjQ8o6cJWZr0bZd/bbHwSQuFiVgwQSHXtyN0dNPXD7FJ9O86SVQOKyHFUfugmV6zXTvMIjCUNCsYkP6e87+XoUj+eI+bnDZiQapUvwHExaK9gc8F/ArwfYNzauYpQToxu+I4v3LAlvsRJYQSW7J73ovfbzeCb0Ls6L0l6gspsNzaPYM9ydESMFZm8DJq3nw7x6s3h/aK58lfRWSG4tXXOAEWlhuh6GBBdDkcqa0Zj5jtmaw76xAJNu6ChGCqfa3FF6pSu3juZtqLwnC7N5ovPyYl3KF2ZP+Cn+EAG7Sm9hW3owJMzXthouGNbbYlCo8sB0LC1xZSl2+/rqObwvRlO1OZx385F8u36e+6vnh67vKve+a9HcxYVrqb5tSSuo4Llt6QkUb0NWB3cx/vW4VutJILA5aNrWYKHK+njK62/TRU/TJ93b0YO/orbs8qXKxSfu59UF0vFn4OHEW6Y3WYL3vMNrpsVTKImOyd+pfQ27skQcc43dPl6BqZC5lsbbphaDaew/he261t7/JS/oeu/R+svwjq3liVSAGv9sMQhQNM7lMC6oTRU26xhQvHp//rPjsT0B9sf+cFGv8XqOD3CbvTdtAoyiQQIobssST3HRLrviqJTu1b5eOqYwdU1AHMv31ZDlxzFnYNeMOxVPfvKAiMHwwp5IC2CCwDXXvKowfGmp/Z5gm+sEEIyBTHlat/b99skQZ77bHwiQaNX71tjX5qM6FiPfJsbcthhn20BRwOpjJtjEKCExeFpn6xgSxzRS0B/5tkVrxTqBJs3dcZVvSpCgshtT/HeVAKuP+vOslGgcEkiQj5oStstFLi8wUfs7vN/KnkOxxdsmzlEp1bGXqtgrmFf7bgKVlW+TGctr5l/J6pxA72/93OcB7wPFII7Z+gyPD+b1mJuCyEihwtbFi0uMEhFM8WE//tOx1Ry7ZmuuPtgbtb+ic5BAQxMAAYknd8PhRPWH1gmuHuTAQKny6nle+WNbRurK3Xxc5zCrlUec+AN7z/Bar2JwAav2Np3jQO2HAMmI5RDLa4KzWdMggOBbVVaz47hWvOfAzxUiOHcV21dDYzOcGBuKr2d6tvb9ur4cyF+7ZvaU8dO4OcC2pWNVqXJEreNuM95O17BGcdO3rdE2/0JvcoQnPlR6ITBXX8WV+q/6aVxO53p7bdA5FlkPdk/XE+USFJ/VMA1VefCmhn8j/8i4uva3WKoV0BSoDsoJMeyPvrjG1oFNjBSVtXwSYKjwORL9oo7XnVr1YLktrgWKj2o1ZrPF5/pvqMq3fh3Pj+r0huVwUy/Q4kB3uO/BKO/e43VvhXr7eaXyaY0ckiPcyx3zvnC3cZ7HFVd9T4YsrV2zzTNOeNr3vctBhACSXgTMcWZHi7szrok1jCKQ1HX33fydiXTtaDxsqnUerjdfzMPLcbM+spmtjU/nr8Lk3RzQepQzzmENcmDptEYmsGwnkPZcZmtO6/jFXuA0nu/URFZz6nVL+xB23d/Hzza1OWwauStLPCwlAYmzr+VytJVhSLaoFa7Z4qdb3/ZrJwHhAQ5feGdItBKYPX6LyaynYjHc84mnD+K5rzEzuiaSi/x61pvbYluAu/gfxm69+Ui3Snafw1+XvZ2Xs3n64zLnq7YsiRdl166XLD3kZJ57UzrkgAHalpQYB6sPWAEPzNbGMds5KtviyBxgV3lcyyRLIBnfqY86RcHCMwUMo/ETNA3eNvXAVR7vKONlVtdZ9gGSENdcp0fZOxH2uqiceoU9+zHrjOvq+v5KqMdXXQRlKzgHCs3Ebt1VsZ0VZiMiRs3UR1s02M/E9tmsyqhtF4X2q5/JUNlugD53HusVvYl3nfxntu5lDUY14lcILEu5Y7YWgOp9sLc7ULRzWUGlx4NprUPZdzDb+KjyrnrU9v1OW/z9jkh/H8ftLqArYt6Rj3YNM9t08axvpLCnYbs5wPudw8ouxxQCIBpjmgcz0ZgjYvCHMdzJVtrANoX0Y5uOO6CtjPNVpTPW8xx+spvwERoxpN3FfANMTUAE896MsT7s9cfn8e/rhWn2MngYo0gqAIuNUTqW3hqz3Srj1pWle1VpsZ0JGI39Z/lI347BA2uw2c89/eWP1t5p13QYl3oez3U/xCe7UR/Z/7nto6l6rlepcuM57IZVJdp1cwk0exGYtEpgSQUSMc3JFl1/9a7JQ40dEupLJvWfYhTb6TmKw0luKe3UMbVWNefnOTqMJNqpjKG4Tuzm4kKc2M7rSazZb1ZXwjtVCXi33z2L3cl8jWFzwD+H3dtR90wW1VPCpl7YYjt9DqXZWDiRp6wTlxg5sLTNrD8obDI7yrNqDLVD6gNrfP6MrgelxzsPsT9cXdRfMMZ4yZf+ANumnkBibJAglVAc4PN4VLslumjwF2JF5Qeu4t+p8v2lOK2q2FQyjm2XSmBphWsN5sAanftVrX0eCjiA5uownw7fO8GOx3KL6wcymo6lx4e1oNp51yhTmrtK+/gdpVUAxZjumN38b2KXfPptxkG967uJq/iHPgW0q4AUbyZHuLC/P/2NGPpOXFylnQJrUH07FR3j+smzD7HwpE7f7uMrHTN7/49PGc4ntIY2HozOjJMldf85lB6BJaWwiTMaCpmclFTlawT8hDBuS/ZJKZbq5uhdOpS+X3qr6WAbO6w80uVQfTmINlsyf5jy1bNxRSK39mzO0lQR2JcL0xOa9QVb32sCj6Bf25bJvo6hJaW08d/qOKWMNbyd0ajfZcthCd3H8f30vkhNyqPlVpUqg5WOKTC1ElgnJeIUlj6w6dLyZ3NWfyk13jZVj1/Lyfdoz3aDfQ97n1GAU/g4oMlKe0Fj41qDxO3jB1rmaOvw/pKmc7zbGMPoBBqGk2ojclumjzdkDuOyo3Znui+UpPft/9z29Sg811vlxuxOlQfv0IkBRkp741h6gSJGJ+4+3NCw+PCk3B3m1paWnLUptR05YhRbKmjL4l2KE/si+ULZPKCL7MuqS5TkcL5wTQ8e/NVFatEfFK7SnkNxdaf29IfZiTyoYBFQOU1tjEg7BNNzqsnseHTxJRpKKYJt6fFz2C0uU5t26T5c9gURIwAK/j+jTkhsC4ho+BjbPqPXB++VH9Pqd6hCzg46HGxaHb5zSm3+LnadleoP28IeAQTnFG+OcWF//3di6Dtx4aG4xoj0+GqL48iX42e/qR3lfv7niiscnHsp1/nBOW9vYRRmJdf58fOKe8sxprTmufCWy9D1qmNpIXF8jw5OcoxfYhyikutw6psWZy9LL/WijLvill4Sp2EWL+mzyA+jNfezfvUlx3jioaWXpVzn3/+54sLIX3pppT+K4oydW0orE7zIgdhzuc6bg1PvigviNKuOLtFPXKc6gHXtrR2SYO8Gx8ihTCtxsoBJp+5luPp4xZ07E8WuN/Gwh7J4WWlMYnfioXwZZqUcR5m3zqr7S4+dqZLjPMq4jkBvpHG+RF5taXrppdRbFiGqohUvM65zz+8Oack4TzNvqb5w+4FdhCr5F0KBlp6TeVwnW+beVU03oxzjn1dcFmNvuR3LPE1R4BFne+jrLcTHB75uAg+T0I/ipbfnpWopjW1L54E1oLnHw1JKgNgqEJn5rhhgGEqha+KU4VUprWxTW9K6gsrbJ7WUZo6CN2pfE1Ddlqp9LQbmOlUVN4Wi6kOzx9tikECC0uoLwB7vWADX7dfxc6WXg248V5UWBmKV86ocrBAxiGMFGMhbbvSYDEPpBZJ1S1XaOZgwLGY+qH0Jo5ByzhYe+nGu97S3GeVjZEbtfYCikNE6Zyy0qaroCYpGT0PiJq58X/1VcARJuwTjOLejpByuqr+O6eawOcBy2IpBSccG0cG9jUtuCzkc+WOxnUFqtzIIbDETUP0FNlrFfw0jrYm68V9DMggcdq1n1XW7dEz09BSxmJq2NUhg09ioj/hRt0ZPw4i2uAm2m+OnIcELYD4WchjnriKsEGn/JYctEYlaAZRZUbUmNBuIE4VvHlsv19fXr9H/a0xY6nYa+zOK376yN/sa7U8idhreOvMi+jH9VgjQyxzhNVqEkdtpPOwkvEbbk5HsdCnNv04j89Lseq/6evd2o4Ed6OHqJGqDWXeTBt/YqENjr9khymrQ5UOnh6PfG7c9eloZ9N6oYuvua33Osjo5emkocSLH99xrWHbYcc7XKE08xJyp4SPtNJibaY05taPEyVAwPHT96359zbPt7G4VHk4K/cHHyn9F/VdDu4sFuzgCPO1SWuyHHiHrgY0/fm4/ozjKnDDylocuXDfeN/kjscei6Q8rXDQDWCnrHOfBwZCXXUnsNA4r4uFAWgjSE207S7MsOX5y4NpLTBfBPX86IFnGWYxi3GlM5ZfDhzgsvMhL05dlDL0TjVST4p163WjQytlpfDu7zXSfmrf0HDf8X9ZQF9kL0/NrUHYBv5wkocj190DrH7D6B6z+Aat/wOqLYHX4LyBCRd/Zf5uw/95h/2/C/fzvAAAA//9NfcCnfTQAAA=="
+    },
+    "kind": "Secret",
+    "metadata": {
+        "creationTimestamp": "2020-05-14T16:13:59Z",
+        "labels": {
+            "modifiedAt": "1589472839",
+            "name": "test",
+            "owner": "helm",
+            "status": "deployed",
+            "version": "1"
+        },
+        "name": "sh.helm.release.v1.test.v1",
+        "namespace": "default",
+        "resourceVersion": "2869",
+        "selfLink": "/api/v1/namespaces/default/secrets/sh.helm.release.v1.test.v1",
+        "uid": "f8151892-2b13-4a55-929b-d7b138feeef6"
+    },
+    "type": "helm.sh/release.v1"
+}
diff --git a/pkg/api/output.go b/pkg/api/output.go
@@ -14,6 +14,7 @@ var padChar = byte(' ')
 // Output is a thing that has an apiVersion in it
 type Output struct {
 	Name       string   `json:"name,omitempty" yaml:"name,omitempty"`
+	Namespace  string   `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	APIVersion *Version `json:"api,omitempty" yaml:"api,omitempty"`
 	Deprecated bool     `json:"deprecated" yaml:"deprecated"`
 	Removed    bool     `json:"removed" yaml:"removed"`
@@ -117,7 +118,7 @@ func (instance *Instance) tabOut() (*tabwriter.Writer, error) {
 	}
 
 	if instance.OutputFormat == "wide" {
-		_, _ = fmt.Fprintln(w, "NAME\t KIND\t VERSION\t REPLACEMENT\t DEPRECATED\t DEPRECATED IN\t REMOVED\t REMOVED IN\t")
+		_, _ = fmt.Fprintln(w, "NAME\t NAMESPACE\t KIND\t VERSION\t REPLACEMENT\t DEPRECATED\t DEPRECATED IN\t REMOVED\t REMOVED IN\t")
 
 		for _, output := range instance.Outputs {
 			kind := output.APIVersion.Kind
@@ -129,7 +130,14 @@ func (instance *Instance) tabOut() (*tabwriter.Writer, error) {
 			deprecatedIn := output.APIVersion.DeprecatedIn
 			removedIn := output.APIVersion.RemovedIn
 
-			_, _ = fmt.Fprintf(w, "%s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t\n", name, kind, version, replacement, deprecated, deprecatedIn, removed, removedIn)
+			var namespace string
+			if output.Namespace == "" {
+				namespace = "<UNKNOWN>"
+			} else {
+				namespace = output.Namespace
+			}
+
+			_, _ = fmt.Fprintf(w, "%s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t\n", name, namespace, kind, version, replacement, deprecated, deprecatedIn, removed, removedIn)
 		}
 
 	}

diff --git a/pkg/api/output_test.go b/pkg/api/output_test.go
@@ -21,7 +21,8 @@ import (
 )
 
 var testOutput1 = &Output{
-	Name: "some name one",
+	Name:      "some name one",
+	Namespace: "pluto-namespace",
 	APIVersion: &Version{
 		Name:           "apps/v1",
 		Kind:           "Deployment",
@@ -76,9 +77,9 @@ func ExampleInstance_DisplayOutput_showAll_wide() {
 	_ = instance.DisplayOutput()
 
 	// Output:
-	// NAME----------- KIND-------- VERSION------------- REPLACEMENT-- DEPRECATED-- DEPRECATED IN-- REMOVED-- REMOVED IN--
-	// some name one-- Deployment-- apps/v1------------- ------------- false------- --------------- false---- ------------
-	// some name two-- Deployment-- extensions/v1beta1-- apps/v1------ true-------- v1.9.0--------- true----- v1.16.0-----
+	// NAME----------- NAMESPACE-------- KIND-------- VERSION------------- REPLACEMENT-- DEPRECATED-- DEPRECATED IN-- REMOVED-- REMOVED IN--
+	// some name one-- pluto-namespace-- Deployment-- apps/v1------------- ------------- false------- --------------- false---- ------------
+	// some name two-- <UNKNOWN>-------- Deployment-- extensions/v1beta1-- apps/v1------ true-------- v1.9.0--------- true----- v1.16.0-----
 }
 
 func ExampleInstance_DisplayOutput_normal() {
@@ -111,8 +112,8 @@ func ExampleInstance_DisplayOutput_wide() {
 	_ = instance.DisplayOutput()
 
 	// Output:
-	// NAME----------- KIND-------- VERSION------------- REPLACEMENT-- DEPRECATED-- DEPRECATED IN-- REMOVED-- REMOVED IN--
-	// some name two-- Deployment-- extensions/v1beta1-- apps/v1------ true-------- v1.9.0--------- true----- v1.16.0-----
+	// NAME----------- NAMESPACE-- KIND-------- VERSION------------- REPLACEMENT-- DEPRECATED-- DEPRECATED IN-- REMOVED-- REMOVED IN--
+	// some name two-- <UNKNOWN>-- Deployment-- extensions/v1beta1-- apps/v1------ true-------- v1.9.0--------- true----- v1.16.0-----
 }
 
 func ExampleInstance_DisplayOutput_showAll_json() {
@@ -128,7 +129,7 @@ func ExampleInstance_DisplayOutput_showAll_json() {
 	_ = instance.DisplayOutput()
 
 	// Output:
-	// {"items":[{"name":"some name one","api":{"version":"apps/v1","kind":"Deployment","deprecated-in":"","removed-in":"","replacement-api":""},"deprecated":false,"removed":false},{"name":"some name two","api":{"version":"extensions/v1beta1","kind":"Deployment","deprecated-in":"v1.9.0","removed-in":"v1.16.0","replacement-api":"apps/v1"},"deprecated":true,"removed":true}],"show-all":true,"target-version":"v1.16.0"}
+	// {"items":[{"name":"some name one","namespace":"pluto-namespace","api":{"version":"apps/v1","kind":"Deployment","deprecated-in":"","removed-in":"","replacement-api":""},"deprecated":false,"removed":false},{"name":"some name two","api":{"version":"extensions/v1beta1","kind":"Deployment","deprecated-in":"v1.9.0","removed-in":"v1.16.0","replacement-api":"apps/v1"},"deprecated":true,"removed":true}],"show-all":true,"target-version":"v1.16.0"}
 }
 
 func ExampleInstance_DisplayOutput_showAll_yaml() {
@@ -146,6 +147,7 @@ func ExampleInstance_DisplayOutput_showAll_yaml() {
 	// Output:
 	// items:
 	// - name: some name one
+	//   namespace: pluto-namespace
 	//   api:
 	//     version: apps/v1
 	//     kind: Deployment

diff --git a/pkg/api/versions.go b/pkg/api/versions.go
@@ -34,7 +34,8 @@ type Stub struct {
 
 // StubMeta will catch kube resource metadata
 type StubMeta struct {
-	Name string `json:"name" yaml:"name"`
+	Name      string `json:"name" yaml:"name"`
+	Namespace string `json:"namespace" yaml:"namespace"`
 }
 
 // Version is an apiVersion and a flag for deprecation
@@ -79,6 +80,7 @@ func IsVersioned(data []byte) ([]*Output, error) {
 			version := checkVersion(stub)
 			if version != nil {
 				output.Name = stub.Metadata.Name
+				output.Namespace = stub.Metadata.Namespace
 				output.APIVersion = version
 			} else {
 				continue

diff --git a/pkg/finder/finder_test.go b/pkg/finder/finder_test.go
@@ -26,7 +26,8 @@ var testPath = "testdata"
 
 var deploymentAppsV1Yaml = "testdata/deployment-apps-v1.yaml"
 var deploymentAppsV1YamlFile = []*api.Output{{
-	Name: "utilities",
+	Name:      "utilities",
+	Namespace: "test-namespaces",
 	APIVersion: &api.Version{
 		Name:         "apps/v1",
 		Kind:         "Deployment",
@@ -36,7 +37,8 @@ var deploymentAppsV1YamlFile = []*api.Output{{
 
 var deploymentExtensionsV1Yaml = "testdata/deployment-extensions-v1beta1.yaml"
 var deploymentExtensionsV1YamlFile = []*api.Output{{
-	Name: "utilities",
+	Name:      "utilities",
+	Namespace: "yaml-namespace",
 	APIVersion: &api.Version{
 		Name:           "extensions/v1beta1",
 		Kind:           "Deployment",
@@ -48,7 +50,8 @@ var deploymentExtensionsV1YamlFile = []*api.Output{{
 
 var deploymentExtensionsV1JSON = "testdata/deployment-extensions-v1beta1.json"
 var deploymentExtensionsV1JSONFile = []*api.Output{{
-	Name: "utilities",
+	Name:      "utilities",
+	Namespace: "json-namespace",
 	APIVersion: &api.Version{
 		Name:           "extensions/v1beta1",
 		Kind:           "Deployment",

diff --git a/pkg/finder/testdata/deployment-apps-v1.yaml b/pkg/finder/testdata/deployment-apps-v1.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: utilities
+  namespace: test-namespaces
   labels:
     app: utilities
 spec:

diff --git a/pkg/finder/testdata/deployment-extensions-v1beta1.json b/pkg/finder/testdata/deployment-extensions-v1beta1.json
@@ -5,7 +5,8 @@
     "labels": {
       "app": "utilities"
     },
-    "name": "utilities"
+    "name": "utilities",
+    "namespace": "json-namespace"
   },
   "spec": {
     "replicas": 1,

diff --git a/pkg/finder/testdata/deployment-extensions-v1beta1.yaml b/pkg/finder/testdata/deployment-extensions-v1beta1.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: utilities
+  namespace: yaml-namespace
   labels:
     app: utilities
 spec:

diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go
@@ -34,16 +34,20 @@ type Helm struct {
 	Kube     *kube
 }
 
+// Release represents a single helm release
 type Release struct {
-	Name     string `json:"name"`
-	Chart    *Chart `json:"chart"`
-	Manifest string `json:"manifest"`
+	Name      string `json:"name"`
+	Namespace string `json:"namespace"`
+	Chart     *Chart `json:"chart"`
+	Manifest  string `json:"manifest"`
 }
 
+// Chart represents a single helm chart
 type Chart struct {
 	Metadata *ChartMeta `json:"metadata"`
 }
 
+// ChartMeta is the metadata of a Helm chart
 type ChartMeta struct {
 	Name    string `json:"name"`
 	Version string `json:"version"`
@@ -142,6 +146,7 @@ func (h *Helm) findVersions() error {
 		}
 		for _, out := range outList {
 			out.Name = release.Name + "/" + out.Name
+			out.Namespace = release.Namespace
 		}
 		h.Outputs = append(h.Outputs, outList...)