Skip to content

Commit 6f1ae85

Browse files
committed
Replace client instantiation with a clearer config
Changed the examples to showcase DynamicClient instantiation without the parameter since `config.load_kube_config()` does not return anything. Signed-off-by: Christoffer Kragh Pedersen <[email protected]>
1 parent 18fe668 commit 6f1ae85

9 files changed

+49
-38
lines changed

examples/dynamic-client/accept_header.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222

2323
def main():
2424
# Creating a dynamic client
25-
client = dynamic.DynamicClient(
26-
api_client.ApiClient(configuration=config.load_kube_config())
27-
)
25+
configuration = api_client.Configuration()
26+
config.load_kube_config()
27+
client = api_client.ApiClient(configuration=configuration)
28+
dynamic_client = dynamic.DynamicClient(client)
29+
2830

2931
# fetching the node api
30-
api = client.resources.get(api_version="v1", kind="Node")
32+
api = dynamic_client.resources.get(api_version="v1", kind="Node")
3133

3234
# Creating a custom header
3335
params = {'header_params': {'Accept': 'application/json;as=PartialObjectMetadataList;v=v1;g=meta.k8s.io'}}

examples/dynamic-client/cluster_scoped_custom_resource.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828

2929
def main():
3030
# Creating a dynamic client
31-
client = dynamic.DynamicClient(
32-
api_client.ApiClient(configuration=config.load_kube_config())
33-
)
31+
configuration = api_client.Configuration()
32+
config.load_kube_config()
33+
client = api_client.ApiClient(configuration=configuration)
34+
dynamic_client = dynamic.DynamicClient(client)
3435

3536
# fetching the custom resource definition (CRD) api
36-
crd_api = client.resources.get(
37+
crd_api = dynamic_client.resources.get(
3738
api_version="apiextensions.k8s.io/v1", kind="CustomResourceDefinition"
3839
)
3940

@@ -104,14 +105,14 @@ def main():
104105
# Fetching the "ingressroutes" CRD api
105106

106107
try:
107-
ingressroute_api = client.resources.get(
108+
ingressroute_api = dynamic_client.resources.get(
108109
api_version="apps.example.com/v1", kind="IngressRoute"
109110
)
110111
except ResourceNotFoundError:
111112
# Need to wait a sec for the discovery layer to get updated
112113
time.sleep(2)
113114

114-
ingressroute_api = client.resources.get(
115+
ingressroute_api = dynamic_client.resources.get(
115116
api_version="apps.example.com/v1", kind="IngressRoute"
116117
)
117118

examples/dynamic-client/configmap.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424

2525
def main():
2626
# Creating a dynamic client
27-
client = dynamic.DynamicClient(
28-
api_client.ApiClient(configuration=config.load_kube_config())
29-
)
27+
configuration = api_client.Configuration()
28+
config.load_kube_config()
29+
client = api_client.ApiClient(configuration=configuration)
30+
dynamic_client = dynamic.DynamicClient(client)
3031

3132
# fetching the configmap api
32-
api = client.resources.get(api_version="v1", kind="ConfigMap")
33+
api = dynamic_client.resources.get(api_version="v1", kind="ConfigMap")
3334

3435
configmap_name = "test-configmap"
3536

examples/dynamic-client/deployment_rolling_restart.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727

2828
def main():
2929
# Creating a dynamic client
30-
client = dynamic.DynamicClient(
31-
api_client.ApiClient(configuration=config.load_kube_config())
32-
)
30+
configuration = api_client.Configuration()
31+
config.load_kube_config()
32+
client = api_client.ApiClient(configuration=configuration)
33+
dynamic_client = dynamic.DynamicClient(client)
3334

3435
# fetching the deployment api
35-
api = client.resources.get(api_version="apps/v1", kind="Deployment")
36+
api = dynamic_client.resources.get(api_version="apps/v1", kind="Deployment")
3637

3738
name = "nginx-deployment"
3839

examples/dynamic-client/namespaced_custom_resource.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@ def delete_namespace(namespace_api, name):
6262

6363
def main():
6464
# Creating a dynamic client
65-
client = dynamic.DynamicClient(
66-
api_client.ApiClient(configuration=config.load_kube_config())
67-
)
65+
configuration = api_client.Configuration()
66+
config.load_kube_config()
67+
client = api_client.ApiClient(configuration=configuration)
68+
dynamic_client = dynamic.DynamicClient(client)
6869

6970
# fetching the custom resource definition (CRD) api
70-
crd_api = client.resources.get(
71+
crd_api = dynamic_client.resources.get(
7172
api_version="apiextensions.k8s.io/v1", kind="CustomResourceDefinition"
7273
)
7374

examples/dynamic-client/node.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@
2323

2424
def main():
2525
# Creating a dynamic client
26-
client = dynamic.DynamicClient(
27-
api_client.ApiClient(configuration=config.load_kube_config())
28-
)
26+
27+
configuration = api_client.Configuration()
28+
config.load_kube_config()
29+
client = api_client.ApiClient(configuration=configuration)
30+
dynamic_client = dynamic.DynamicClient(client)
2931

3032
# fetching the node api
31-
api = client.resources.get(api_version="v1", kind="Node")
33+
api = dynamic_client.resources.get(api_version="v1", kind="Node")
3234

3335
# Listing cluster nodes
3436

examples/dynamic-client/replication_controller.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222

2323
def main():
2424
# Creating a dynamic client
25-
client = dynamic.DynamicClient(
26-
api_client.ApiClient(configuration=config.load_kube_config())
27-
)
25+
configuration = api_client.Configuration()
26+
config.load_kube_config()
27+
client = api_client.ApiClient(configuration=configuration)
28+
dynamic_client = dynamic.DynamicClient(client)
2829

2930
# fetching the replication controller api
30-
api = client.resources.get(api_version="v1", kind="ReplicationController")
31+
api = dynamic_client.resources.get(api_version="v1", kind="ReplicationController")
3132

3233
name = "frontend-replication-controller"
3334

examples/dynamic-client/request_timeout.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424

2525
def main():
2626
# Creating a dynamic client
27-
client = dynamic.DynamicClient(
28-
api_client.ApiClient(configuration=config.load_kube_config())
29-
)
27+
configuration = api_client.Configuration()
28+
config.load_kube_config()
29+
client = api_client.ApiClient(configuration=configuration)
30+
dynamic_client = dynamic.DynamicClient(client)
3031

3132
# fetching the configmap api
32-
api = client.resources.get(api_version="v1", kind="ConfigMap")
33+
api = dynamic_client.resources.get(api_version="v1", kind="ConfigMap")
3334

3435
configmap_name = "request-timeout-test-configmap"
3536

examples/dynamic-client/service.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424

2525
def main():
2626
# Creating a dynamic client
27-
client = dynamic.DynamicClient(
28-
api_client.ApiClient(configuration=config.load_kube_config())
29-
)
27+
configuration = api_client.Configuration()
28+
config.load_kube_config()
29+
client = api_client.ApiClient(configuration=configuration)
30+
dynamic_client = dynamic.DynamicClient(client)
3031

3132
# fetching the service api
32-
api = client.resources.get(api_version="v1", kind="Service")
33+
api = dynamic_client.resources.get(api_version="v1", kind="Service")
3334

3435
name = "frontend-service"
3536

0 commit comments

Comments
 (0)