Merge pull request #19522 from apcera/dev_python3

cluster/aws/util.sh

@@ -117,7 +117,7 @@ function get_igw_id {
 function get_elbs_in_vpc {
   # ELB doesn't seem to be on the same platform as the rest of AWS; doesn't support filtering
   aws elb --output json describe-load-balancers  | \
-    python -c "import json,sys; lst = [str(lb['LoadBalancerName']) for lb in json.load(sys.stdin)['LoadBalancerDescriptions'] if lb['VPCId'] == '$1']; print '\n'.join(lst)"
+    python -c "import json,sys; lst = [str(lb['LoadBalancerName']) for lb in json.load(sys.stdin)['LoadBalancerDescriptions'] if lb['VPCId'] == '$1']; print('\n'.join(lst))"
 }
 
 function get_instanceid_from_name {

cluster/centos/util.sh

@@ -297,6 +297,6 @@ function get-password {
   if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
     KUBE_USER=admin
     KUBE_PASSWORD=$(python -c 'import string,random; \
-      print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
+      print("".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16)))')
   fi
 }

cluster/common.sh

@@ -170,7 +170,7 @@ function get-kubeconfig-basicauth() {
 #   KUBE_PASSWORD
 function gen-kube-basicauth() {
     KUBE_USER=admin
-    KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
+    KUBE_PASSWORD=$(python -c 'import string,random; print("".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16)))')
 }
 
 # Get the bearer token for the current-context in kubeconfig if one exists.

cluster/gce/configure-vm.sh

@@ -81,8 +81,8 @@ function set-kube-env() {
 import pipes,sys,yaml
 
 for k,v in yaml.load(sys.stdin).iteritems():
-  print """readonly {var}={value}""".format(var = k, value = pipes.quote(str(v)))
-  print """export {var}""".format(var = k)
+  print("""readonly {var}={value}""".format(var = k, value = pipes.quote(str(v))))
+  print("""export {var}""".format(var = k))
   ' < """${kube_env_yaml}""")"
 }
 

cluster/gce/trusty/configure.sh

@@ -61,7 +61,7 @@ download_kube_env() {
   eval $(python -c '''
 import pipes,sys,yaml
 for k,v in yaml.load(sys.stdin).iteritems():
-  print "readonly {var}={value}".format(var = k, value = pipes.quote(str(v)))
+  print("readonly {var}={value}".format(var = k, value = pipes.quote(str(v))))
 ''' < /tmp/kube-env-yaml > /etc/kube-env)
 }
 

cluster/saltbase/salt/kube-addons/kube-addons.sh

@@ -175,7 +175,7 @@ if [ ! -e "${kubelet_kubeconfig_file}" ]; then
 import pipes,sys,yaml
 
 for k,v in yaml.load(sys.stdin).iteritems():
-  print "readonly {var}={value}".format(var = k, value = pipes.quote(str(v)))
+  print("readonly {var}={value}".format(var = k, value = pipes.quote(str(v))))
 ''' < "${kube_env_yaml}")
 fi
 

hack/parallel-e2e.sh

@@ -80,9 +80,9 @@ failed = False
 for testcase in parse(sys.stdin).getElementsByTagName("testcase"):
   if len(testcase.getElementsByTagName("failure")) != 0:
     failed = True
-    print "  FAIL: {test}".format(test = testcase.getAttribute("name"))
+    print("  FAIL: {test}".format(test = testcase.getAttribute("name")))
 if not failed:
-  print "  SUCCESS!"
+  print("  SUCCESS!")
 '
 }