Skip to content

Commit

Permalink
chore: use f-string
Browse files Browse the repository at this point in the history
  • Loading branch information
Ananya2001-an authored and yliaog committed Sep 17, 2023
1 parent d77daf4 commit 8a7e24b
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 60 deletions.
6 changes: 2 additions & 4 deletions examples/annotate_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand All @@ -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__":
Expand Down
5 changes: 2 additions & 3 deletions examples/api_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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__':
Expand Down
2 changes: 1 addition & 1 deletion examples/apply_from_directory.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from kubernetes import client,config,utils
from kubernetes import client, config, utils

def main():
config.load_kube_config()
Expand Down
4 changes: 2 additions & 2 deletions examples/apply_from_single_file.py
Original file line number Diff line number Diff line change
@@ -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__":
Expand Down
15 changes: 3 additions & 12 deletions examples/cluster_scoped_custom_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
3 changes: 1 addition & 2 deletions examples/in_cluster_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
10 changes: 5 additions & 5 deletions examples/job_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


def create_job_object():
# Configureate Pod template container
# Configure Pod template container
container = client.V1Container(
name="pi",
image="perl",
Expand All @@ -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)


Expand All @@ -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):
Expand All @@ -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):
Expand All @@ -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():
Expand Down
8 changes: 3 additions & 5 deletions examples/multiple_clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
2 changes: 1 addition & 1 deletion examples/node_labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
5 changes: 2 additions & 3 deletions examples/out_of_cluster_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

"""
Shows how to load a Kubernetes config from outside of the cluster.
Shows how to load a Kubernetes config from outside the cluster.
"""

from kubernetes import client, config
Expand All @@ -29,8 +29,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__':
Expand Down
2 changes: 1 addition & 1 deletion examples/pick_kube_config_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def main():
# utility
config.load_kube_config(context=option)

print("Active host is %s" % configuration.Configuration().host)
print(f"Active host is {configuration.Configuration().host}")

v1 = client.CoreV1Api()
print("Listing pods with their IPs:")
Expand Down
2 changes: 1 addition & 1 deletion examples/pod_config_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def main():
# utility
config.load_kube_config(context=option)

print("Active host is %s" % configuration.Configuration().host)
print(f"Active host is {configuration.Configuration().host}")

v1 = client.CoreV1Api()
print("Listing pods with their IPs:")
Expand Down
14 changes: 7 additions & 7 deletions examples/pod_exec.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ def exec_commands(api_instance):
namespace='default')
except ApiException as e:
if e.status != 404:
print("Unknown error: %s" % e)
print(f"Unknown error: {e}")
exit(1)

if not resp:
print("Pod %s does not exist. Creating it..." % name)
print(f"Pod {name} does not exist. Creating it...")
pod_manifest = {
'apiVersion': 'v1',
'kind': 'Pod',
Expand Down Expand Up @@ -98,22 +98,22 @@ def exec_commands(api_instance):
while resp.is_open():
resp.update(timeout=1)
if resp.peek_stdout():
print("STDOUT: %s" % resp.read_stdout())
print(f"STDOUT: {resp.read_stdout()}")
if resp.peek_stderr():
print("STDERR: %s" % resp.read_stderr())
print(f"STDERR: {resp.read_stderr()}")
if commands:
c = commands.pop(0)
print("Running command... %s\n" % c)
print(f"Running command... {c}\n")
resp.write_stdin(c + "\n")
else:
break

resp.write_stdin("date\n")
sdate = resp.readline_stdout(timeout=3)
print("Server date command returns: %s" % sdate)
print(f"Server date command returns: {sdate}")
resp.write_stdin("whoami\n")
user = resp.readline_stdout(timeout=3)
print("Server user is: %s" % user)
print(f"Server user is: {user}")
resp.close()


Expand Down
19 changes: 9 additions & 10 deletions examples/pod_portforward.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ def portforward_commands(api_instance):
namespace='default')
except ApiException as e:
if e.status != 404:
print("Unknown error: %s" % e)
print(f"Unknown error: {e}")
exit(1)

if not resp:
print("Pod %s does not exist. Creating it..." % name)
print(f"Pod {name} does not exist. Creating it...")
pod_manifest = {
'apiVersion': 'v1',
'kind': 'Pod',
Expand Down Expand Up @@ -119,7 +119,7 @@ def portforward_commands(api_instance):
if error is None:
print("No port forward errors on port 80.")
else:
print("Port 80 has the following error: %s" % error)
print(f"Port 80 has the following error: {error}")

# Monkey patch socket.create_connection which is used by http.client and
# urllib.request. The same can be done with urllib3.util.connection.create_connection
Expand Down Expand Up @@ -147,10 +147,10 @@ def kubernetes_create_connection(address, *args, **kwargs):
break
else:
raise RuntimeError(
"Unable to find service port: %s" % port)
f"Unable to find service port: {port}")
label_selector = []
for key, value in service.spec.selector.items():
label_selector.append("%s=%s" % (key, value))
label_selector.append(f"{key}={value}")
pods = api_instance.list_namespaced_pod(
namespace, label_selector=",".join(label_selector)
)
Expand All @@ -168,11 +168,10 @@ def kubernetes_create_connection(address, *args, **kwargs):
break
else:
raise RuntimeError(
"Unable to find service port name: %s" % port)
f"Unable to find service port name: {port}")
elif dns_name[1] != 'pod':
raise RuntimeError(
"Unsupported resource type: %s" %
dns_name[1])
f"Unsupported resource type: {dns_name[1]}")
pf = portforward(api_instance.connect_get_namespaced_pod_portforward,
name, namespace, ports=str(port))
return pf.socket(port)
Expand All @@ -181,10 +180,10 @@ def kubernetes_create_connection(address, *args, **kwargs):
# Access the nginx http server using the
# "<pod-name>.pod.<namespace>.kubernetes" dns name.
response = urllib_request.urlopen(
'http://%s.pod.default.kubernetes' % name)
f'http://{name}.pod.default.kubernetes')
html = response.read().decode('utf-8')
response.close()
print('Status Code: %s' % response.code)
print(f'Status Code: {response.code}')
print(html)


Expand Down
3 changes: 1 addition & 2 deletions examples/remote_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,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__':
Expand Down

0 comments on commit 8a7e24b

Please sign in to comment.