Merge pull request #2124 from Ananya2001-an/chore-format-string

chore: use f-string in place of old-style formatted string

Author: k8s-ci-robot

examples/annotate_deployment.py

@@ -62,8 +62,7 @@ def main():
     time.sleep(1)
     before_annotating = apps_v1_api.read_namespaced_deployment(
         'deploy-nginx', 'default')
-    print('Before annotating, annotations: %s' %
-          before_annotating.metadata.annotations)
+    print(f"Before annotating, annotations: {before_annotating.metadata.annotations}")
 
     annotations = [
         {
@@ -80,8 +79,7 @@ def main():
     time.sleep(1)
     after_annotating = apps_v1_api.read_namespaced_deployment(
         name='deploy-nginx', namespace='default')
-    print('After annotating, annotations: %s' %
-          after_annotating.metadata.annotations)
+    print(f"After annotating, annotations: {after_annotating.metadata.annotations}")
 
 
 if __name__ == "__main__":

examples/api_discovery.py

@@ -27,8 +27,7 @@ def main():
     config.load_kube_config()
 
     print("Supported APIs (* is preferred version):")
-    print("%-40s %s" %
-          ("core", ",".join(client.CoreApi().get_api_versions().versions)))
+    print(f"{'core':<40} {','.join(client.CoreApi().get_api_versions().versions)}")
     for api in client.ApisApi().get_api_versions().groups:
         versions = []
         for v in api.versions:
@@ -38,7 +37,7 @@ def main():
                 name += "*"
             name += v.version
             versions.append(name)
-        print("%-40s %s" % (api.name, ",".join(versions)))
+        print(f"{api.name:<40} {','.join(versions)}")
 
 
 if __name__ == '__main__':

examples/apply_from_directory.py

@@ -1,4 +1,4 @@
-from kubernetes import client,config,utils
+from kubernetes import client, config, utils
 
 def main():
     config.load_kube_config()

examples/apply_from_single_file.py

@@ -1,9 +1,9 @@
-from kubernetes import client,config,utils
+from kubernetes import client, config, utils
 
 def main():
     config.load_kube_config()
     k8s_client = client.ApiClient()
-    yaml_file = 'examples/configmap-demo-pod.yml'
+    yaml_file = 'examples/yaml_dir/configmap-demo-pod.yml'
     utils.create_from_yaml(k8s_client,yaml_file,verbose=True)
 
 if __name__ == "__main__":

examples/cluster_scoped_custom_object.py

@@ -100,10 +100,7 @@ def main():
         plural="crontabs",
     )
     print("%s\t\t%s" % ("NAME", "CRON-SPEC"))
-    print(
-        "%s\t%s\n" %
-        (resource["metadata"]["name"],
-         resource["spec"]["cronSpec"]))
+    print(f"{resource['metadata']['name']}\t{resource['spec']['cronSpec']}\n")
 
     # patch the `spec.cronSpec` field of the custom resource
     patched_resource = api.patch_cluster_custom_object(
@@ -115,10 +112,7 @@ def main():
     )
     print("[INFO] Custom resource `test-crontab` patched to update the cronSpec schedule!\n")
     print("%s\t\t%s" % ("NAME", "PATCHED-CRON-SPEC"))
-    print(
-        "%s\t%s\n" %
-        (patched_resource["metadata"]["name"],
-         patched_resource["spec"]["cronSpec"]))
+    print(f"{patched_resource['metadata']['name']}\t{patched_resource['spec']['cronSpec']}\n")
 
     # patch the `metadata.labels` field of the custom resource
     patched_resource = api.patch_cluster_custom_object(
@@ -130,10 +124,7 @@ def main():
     )
     print("[INFO] Custom resource `test-crontab` patched to apply new metadata labels!\n")
     print("%s\t\t%s" % ("NAME", "PATCHED_LABELS"))
-    print(
-        "%s\t%s\n" %
-        (patched_resource["metadata"]["name"],
-         patched_resource["metadata"]["labels"]))
+    print(f"{patched_resource['metadata']['name']}\t{patched_resource['metadata']['labels']}\n")
 
     # delete the custom resource "test-crontab"
     api.delete_cluster_custom_object(

examples/deployment_create.py

@@ -34,7 +34,7 @@ def main():
         k8s_apps_v1 = client.AppsV1Api()
         resp = k8s_apps_v1.create_namespaced_deployment(
             body=dep, namespace="default")
-        print("Deployment created. status='%s'" % resp.metadata.name)
+        print(f"Deployment created. Status='{resp.metadata.name}'")
 
 
 if __name__ == '__main__':

examples/in_cluster_config.py

@@ -58,8 +58,7 @@ def main():
     print("Listing pods with their IPs:")
     ret = v1.list_pod_for_all_namespaces(watch=False)
     for i in ret.items:
-        print("%s\t%s\t%s" %
-              (i.status.pod_ip, i.metadata.namespace, i.metadata.name))
+        print(f"{i.status.pod_ip}\t{i.metadata.namespace}\t{i.metadata.name}")
 
 
 if __name__ == '__main__':

examples/job_crud.py

@@ -27,7 +27,7 @@
 
 
 def create_job_object():
-    # Configureate Pod template container
+    # Configure Pod template container
     container = client.V1Container(
         name="pi",
         image="perl",
@@ -54,7 +54,7 @@ def create_job(api_instance, job):
     api_response = api_instance.create_namespaced_job(
         body=job,
         namespace="default")
-    print("Job created. status='%s'" % str(api_response.status))
+    print(f"Job created. status='{str(api_response.status)}'")
     get_job_status(api_instance)
 
 
@@ -68,7 +68,7 @@ def get_job_status(api_instance):
                 api_response.status.failed is not None:
             job_completed = True
         sleep(1)
-        print("Job status='%s'" % str(api_response.status))
+        print(f"Job status='{str(api_response.status)}'")
 
 
 def update_job(api_instance, job):
@@ -78,7 +78,7 @@ def update_job(api_instance, job):
         name=JOB_NAME,
         namespace="default",
         body=job)
-    print("Job updated. status='%s'" % str(api_response.status))
+    print(f"Job updated. status='{str(api_response.status)}'")
 
 
 def delete_job(api_instance):
@@ -88,7 +88,7 @@ def delete_job(api_instance):
         body=client.V1DeleteOptions(
             propagation_policy='Foreground',
             grace_period_seconds=5))
-    print("Job deleted. status='%s'" % str(api_response.status))
+    print(f"Job deleted. status='{str(api_response.status)}'")
 
 
 def main():

examples/multiple_clusters.py

@@ -43,13 +43,11 @@ def main():
 
     print("\nList of pods on %s:" % cluster1)
     for i in client1.list_pod_for_all_namespaces().items:
-        print("%s\t%s\t%s" %
-              (i.status.pod_ip, i.metadata.namespace, i.metadata.name))
+        print(f"{i.status.pod_ip}\t{i.metadata.namespace}\t{i.metadata.name}")
 
-    print("\n\nList of pods on %s:" % cluster2)
+    print(f"\n\nList of pods on {cluster2}:")
     for i in client2.list_pod_for_all_namespaces().items:
-        print("%s\t%s\t%s" %
-              (i.status.pod_ip, i.metadata.namespace, i.metadata.name))
+        print(f"{i.status.pod_ip}\t{i.metadata.namespace}\t{i.metadata.name}")
 
 
 if __name__ == '__main__':

examples/node_labels.py

@@ -44,7 +44,7 @@ def main():
     # Patching the node labels
     for node in node_list.items:
         api_response = api_instance.patch_node(node.metadata.name, body)
-        print("%s\t%s" % (node.metadata.name, node.metadata.labels))
+        print(f"{node.metadata.name}\t{node.metadata.labels}")
 
 
 if __name__ == '__main__':