paasta-tools 1.17.1__tar.gz → 1.17.2__tar.gz

{paasta-tools-1.17.1/paasta_tools.egg-info → paasta-tools-1.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.17.1
+Version: 1.17.2
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.17.1 → paasta-tools-1.17.2}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.17.1"
+__version__ = "1.17.2"

{paasta-tools-1.17.1 → paasta-tools-1.17.2}/paasta_tools/cli/cmds/remote_run.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import argparse
+import shutil
 import time
 
 from paasta_tools.cli.utils import get_paasta_oapi_api_clustername
@@ -29,7 +30,7 @@ from paasta_tools.utils import SystemPaastaConfig
 
 
 KUBECTL_CMD_TEMPLATE = (
-    "kubectl-eks-{cluster} --token {token} exec -it -n {namespace} {pod} -- /bin/bash"
+    "{kubectl_wrapper} --token {token} exec -it -n {namespace} {pod} -- /bin/bash"
 )
 
 
@@ -89,8 +90,11 @@ def paasta_remote_run_start(
         args.service, args.instance, user
     )
 
+    kubectl_wrapper = f"kubectl-eks-{args.cluster}"
+    if not shutil.which(kubectl_wrapper):
+        kubectl_wrapper = f"kubectl-{args.cluster}"
     exec_command = KUBECTL_CMD_TEMPLATE.format(
-        cluster=args.cluster,
+        kubectl_wrapper=kubectl_wrapper,
         namespace=poll_response.namespace,
         pod=poll_response.pod_name,
         token=token_response.token,

{paasta-tools-1.17.1 → paasta-tools-1.17.2}/paasta_tools/kubernetes/remote_run.py

@@ -374,7 +374,11 @@ def create_pod_scoped_role(
             labels={POD_OWNER_LABEL: user},
         ),
     )
-    kube_client.rbac.create_namespaced_role(namespace=namespace, body=role)
+    try:
+        kube_client.rbac.create_namespaced_role(namespace=namespace, body=role)
+    except ApiException as e:
+        if e.status != 409:
+            raise
     return role_name
 
 
@@ -411,10 +415,14 @@ def bind_role_to_service_account(
             ),
         ],
     )
-    kube_client.rbac.create_namespaced_role_binding(
-        namespace=namespace,
-        body=role_binding,
-    )
+    try:
+        kube_client.rbac.create_namespaced_role_binding(
+            namespace=namespace,
+            body=role_binding,
+        )
+    except ApiException as e:
+        if e.status != 409:
+            raise
 
 
 def get_remote_run_roles(kube_client: KubeClient, namespace: str) -> List[V1Role]:

{paasta-tools-1.17.1 → paasta-tools-1.17.2/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.17.1
+Version: 1.17.2
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp