Convert examples/ to use kube::k8s re-exports

Signed-off-by: clux <[email protected]>

Author: clux

examples/cert_check.rs

@@ -1,12 +1,10 @@
 use std::borrow::Cow;
 
-use k8s_openapi::{
-    api::core::v1::{ConfigMap, Namespace as Ns},
-    NamespaceResourceScope,
-};
 use kube::{
     api::ObjectMeta,
     client::scope::{Cluster, Namespace},
+    core::NamespaceResourceScope,
+    k8s::corev1::{ConfigMap, Namespace as Ns},
     Client, Resource,
 };
 use serde::{Deserialize, Serialize};
@@ -20,7 +18,7 @@ struct CaConfigMapData {
     ca_crt: String,
 }
 
-// Method 1 :: inherit resource implementation from k8s_openapi's ConfigMap
+// Method 1 :: inherit resource implementation from the official ConfigMap
 #[derive(Resource, Serialize, Deserialize, Debug, Clone)]
 #[resource(inherit = ConfigMap)]
 struct CaConfigMap {

examples/configmapgen_controller.rs

@@ -3,9 +3,9 @@
 
 use anyhow::Result;
 use futures::StreamExt;
-use k8s_openapi::api::core::v1::ConfigMap;
 use kube::{
     api::{Api, ObjectMeta, Patch, PatchParams, Resource},
+    k8s::corev1::ConfigMap,
     runtime::{
         controller::{Action, Config, Controller},
         watcher,

examples/crd_api.rs

@@ -8,10 +8,10 @@ use std::time::Duration;
 use tokio::time::sleep;
 use tracing::*;
 
-use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition;
 use kube::{
     api::{Api, DeleteParams, ListParams, Patch, PatchParams, PostParams, ResourceExt},
     core::crd::CustomResourceExt,
+    k8s::apiextensionsv1::CustomResourceDefinition,
     Client, CustomResource,
 };
 

examples/crd_apply.rs

@@ -4,11 +4,9 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::*;
 
-use apiexts::CustomResourceDefinition;
-use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1 as apiexts;
-
 use kube::{
     api::{Api, Patch, PatchParams, ResourceExt},
+    k8s::apiextensionsv1::CustomResourceDefinition,
     runtime::wait::{await_condition, conditions},
     Client, CustomResource, CustomResourceExt,
 };

examples/crd_derive.rs

@@ -1,6 +1,6 @@
-use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;
 use kube::{
     core::object::{HasSpec, HasStatus},
+    k8s::metav1::Condition,
     CustomResource, CustomResourceExt, Resource,
 };
 use schemars::JsonSchema;

examples/crd_derive_multi.rs

@@ -1,7 +1,7 @@
-use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition;
 use kube::{
     api::{Api, Patch, PatchParams},
     core::crd::merge_crds,
+    k8s::apiextensionsv1::CustomResourceDefinition,
     runtime::wait::{await_condition, conditions},
     Client, CustomResource, CustomResourceExt, ResourceExt,
 };

examples/crd_derive_no_schema.rs

@@ -1,7 +1,5 @@
-use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::{
-    CustomResourceDefinition, CustomResourceValidation, JSONSchemaProps,
-};
-use kube_derive::CustomResource;
+use apiext::{CustomResourceDefinition, CustomResourceValidation, JSONSchemaProps};
+use kube::{k8s::apiextensionsv1 as apiext, CustomResource};
 use serde::{Deserialize, Serialize};
 
 /// CustomResource with manually implemented schema

examples/crd_derive_schema.rs

@@ -1,11 +1,11 @@
 use anyhow::{anyhow, Result};
 use futures::{StreamExt, TryStreamExt};
-use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition;
 use kube::{
     api::{
         Api, ApiResource, DeleteParams, DynamicObject, GroupVersionKind, Patch, PatchParams, PostParams,
         WatchEvent, WatchParams,
     },
+    k8s::apiextensionsv1::CustomResourceDefinition,
     runtime::wait::{await_condition, conditions},
     Client, CustomResource, CustomResourceExt,
 };

examples/crd_reflector.rs

@@ -1,9 +1,9 @@
 use futures::{StreamExt, TryStreamExt};
-use k8s_openapi::apiextensions_apiserver::pkg::apis::apiextensions::v1::CustomResourceDefinition;
 use tracing::*;
 
 use kube::{
     api::{Api, Patch, PatchParams, ResourceExt},
+    k8s::apiextensionsv1::CustomResourceDefinition,
     runtime::{reflector, watcher, WatchStreamExt},
     Client, CustomResource, CustomResourceExt,
 };

examples/custom_client.rs

@@ -1,6 +1,5 @@
 use hyper_util::rt::TokioExecutor;
 // Minimal custom client example.
-use k8s_openapi::api::core::v1::Pod;
 use tower::BoxError;
 use tracing::*;
 
@@ -20,7 +19,7 @@ async fn main() -> anyhow::Result<()> {
         .service(hyper_util::client::legacy::Client::builder(TokioExecutor::new()).build(https));
     let client = Client::new(service, config.default_namespace);
 
-    let pods: Api<Pod> = Api::default_namespaced(client);
+    let pods: Api<kube::k8s::corev1::Pod> = Api::default_namespaced(client);
     for p in pods.list(&Default::default()).await? {
         info!("{}", p.name_any());
     }