Fixes for app/verify (#138)

Author: vcanaa

marketplace/deployer_util/bash_util.py

@@ -38,6 +38,7 @@ def __init__(self, cmd, print_call=False, print_result=False):
     self._error = None
     self._print_call = print_call
     self._print_result = print_result
+    self._run()
 
   def jq(self, query):
     return self.pipe("jq {}".format(query))
@@ -53,22 +54,20 @@ def pipe(self, cmd):
       stderr=subprocess.PIPE)
 
     self._process = p2
+    self._run()
     return self
 
-  def text(self):
-    if self._exitcode is None:
-      self.output, self._error = self._process.communicate()
-      self._exitcode = self._process.returncode
-      if self._print_result:
-        print "result: " + str((self._exitcode, self.output, self._error))
+  def _run(self):
+    self._output, self._error = self._process.communicate()
+    self._exitcode = self._process.returncode
+    if self._print_result:
+      print "result: " + str((self._exitcode, self._output, self._error))
 
     if self._exitcode > 0:
       raise CommandException(self._error)
 
-    return self.output
-
   def json(self):
-    return json.loads(self.text())
+    return json.loads(self._output)
 
   @property
   def exitcode(self):

marketplace/deployer_util/resources.py

@@ -21,11 +21,19 @@ def set_resource_ownership(appuid, appname, resource):
   if 'ownerReferences' not in resource['metadata']:
     resource['metadata']['ownerReferences'] = []
 
-  ownerReference = {}
-  ownerReference['apiVersion'] = "app.k8s.io/v1alpha1"
-  ownerReference['kind'] = "Application"
-  ownerReference['controller'] = True
-  ownerReference['blockOwnerDeletion'] = True
-  ownerReference['name'] = appname
-  ownerReference['uid'] = appuid
-  resource['metadata']['ownerReferences'].append(ownerReference)
+  owner_reference = None
+  for existing_owner_reference in resource['metadata']['ownerReferences']:
+    if existing_owner_reference['uid'] == appuid:
+      owner_reference = existing_owner_reference
+      break
+
+  if not owner_reference:
+    owner_reference = {}
+    resource['metadata']['ownerReferences'].append(owner_reference)
+
+  owner_reference['apiVersion'] = "app.k8s.io/v1alpha1"
+  owner_reference['kind'] = "Application"
+  owner_reference['controller'] = True
+  owner_reference['blockOwnerDeletion'] = True
+  owner_reference['name'] = appname
+  owner_reference['uid'] = appuid

marketplace/deployer_util/run_tester.py

@@ -31,11 +31,11 @@ def main():
   parser.add_argument('--manifest')
   args = parser.parse_args()
 
-  Command('''
+  kubectl_apply = Command('''
     kubectl apply
     --namespace="{}"
     --filename="{}"
-    '''.format(args.namespace, args.manifest))
+    '''.format(args.namespace, args.manifest), print_call=True)
 
   resources = load_resources_yaml(args.manifest)
 
@@ -56,7 +56,7 @@ def main():
           kubectl get "{}"
           --namespace="{}"
           -o=json
-          '''.format(full_name, args.namespace)).json()
+          '''.format(full_name, args.namespace), print_call=True).json()
       except CommandException as ex:
         log(str(ex))
         log("INFO retrying")
@@ -82,7 +82,7 @@ def main():
 
 
 def print_logs(full_name, namespace):
-  log(Command('''kubectl logs {} --namespace="{}"'''.format(full_name, namespace)).text())
+  log(Command('''kubectl logs {} --namespace="{}"'''.format(full_name, namespace)).output)
 
 
 def log(msg):

marketplace/deployer_util/wait_for_ready.py

@@ -39,7 +39,7 @@ def main():
     kubectl get "applications/{}"
       --namespace="{}" 
       --output=json
-    '''.format(args.name, args.namespace)).json()
+    '''.format(args.name, args.namespace), print_call=True).json()
 
   application_uid = application['metadata']['uid']