IAM PR update merge with master.

scripts/kfctl.sh

@@ -49,24 +49,6 @@ createEnv() {
       echo KUBEFLOW_PLATFORM=gke >> ${ENV_FILE}
       echo PROJECT="${PROJECT}" >> ${ENV_FILE}
       echo ZONE=${ZONE} >> ${ENV_FILE}
-
-      # GCP Email for cert manager
-      if [ -z "$EMAIL" ]; then
-        EMAIL=$(gcloud config get-value account 2>/dev/null)
-        if [ -z "$EMAIL" ]; then
-          echo "GCP account must be set either using --email <EMAIL>"
-          echo "or by setting a default account in gcloud config"
-          exit 1
-        fi
-        # Use iam-policy value for EMAIL if case-sensitive
-        EM_LIST="$(gcloud projects get-iam-policy $PROJECT | grep -io $EMAIL)"
-        for em in $EM_LIST; do
-          if [ "$em" != "$EMAIL" ]; then
-            EMAIL=$em
-            break
-          fi
-        done
-      fi
       echo EMAIL=${EMAIL} >> ${ENV_FILE}
 
       # TODO: Do we need to make PROJECT_NUMBER also a flag like --project-number
@@ -232,6 +214,14 @@ parseArgs() {
         echo "or by setting a default account in gcloud config"
         exit 1
       fi
+      # Use iam-policy value for EMAIL if case-sensitive
+      EM_LIST="$(gcloud projects get-iam-policy $PROJECT | grep -io $EMAIL)"
+      for em in $EM_LIST; do
+        if [ "$em" != "$EMAIL" ]; then
+          EMAIL=$em
+          break
+        fi
+      done
     fi
   fi
 }