chore (kubernetes-examples) : Update Kubernetes Examples samples to use up to date code (#4873)

+ Replace deprecated method calls with updated method calls
+ Replace load(..).get() with load(..).item() calls

Signed-off-by: Rohan Kumar <[email protected]>

Author: rohanKanojia

CHANGELOG.md

@@ -35,6 +35,7 @@
 * Fix #4863: default HttpClient retry logic to 100ms interval
 * Fix #4863: default HttpClient retry logic to 10 attempts
 * Fix #4865: (java-generator) performance improvements
+* Fix #4873: Update all samples in `kubernetes-examples/` module to use up to date code
 
 #### Dependency Upgrade
 * Fix #4655: Upgrade Fabric8 Kubernetes Model to Kubernetes v1.26.0

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/BindingExample.java

@@ -44,7 +44,7 @@ public static void main(String[] args) {
             .orElseThrow(() -> new IllegalStateException("No namespace available")).getMetadata().getName();
       }
 
-      client.pods().inNamespace(namespace).create(new PodBuilder()
+      client.pods().inNamespace(namespace).resource(new PodBuilder()
           .withMetadata(new ObjectMetaBuilder()
               .withName(podName)
               .build())
@@ -55,16 +55,16 @@ public static void main(String[] args) {
               .withImage("nginx:latest")
               .endContainer()
               .build())
-          .build());
+          .build()).create();
       final Node firstNode = client.nodes().list().getItems().stream().findFirst()
           .orElseThrow(() -> new IllegalStateException("No nodes available"));
-      client.bindings().inNamespace(namespace).create(new BindingBuilder()
+      client.bindings().inNamespace(namespace).resource(new BindingBuilder()
           .withNewMetadata().withName(podName).endMetadata()
           .withNewTarget()
           .withKind(firstNode.getKind())
           .withApiVersion(firstNode.getApiVersion())
           .withName(firstNode.getMetadata().getName()).endTarget()
-          .build());
+          .build()).create();
       System.out.printf("Successfully bound Pod %s to Node %s%n",
           podName, firstNode.getMetadata().getName());
     }

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CRDExample.java

@@ -24,6 +24,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.WatcherException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -128,7 +129,7 @@ public static void main(String[] args) {
             .endSpec()
             .build();
 
-        client.apiextensions().v1().customResourceDefinitions().create(dummyCRD);
+        client.apiextensions().v1().customResourceDefinitions().resource(dummyCRD).create();
         System.out.println("Created CRD " + dummyCRD.getMetadata().getName());
       }
 
@@ -157,16 +158,16 @@ public static void main(String[] args) {
       dummySpec.setFoo("cheese: " + now);
       dummy.setSpec(dummySpec);
 
-      Dummy created = dummyClient.createOrReplace(dummy);
+      Dummy created = dummyClient.resource(dummy).createOrReplace();
 
       System.out.println("Upserted " + dummy);
 
       created.getSpec().setBar("otherBar");
 
-      dummyClient.createOrReplace(created);
+      dummyClient.resource(created).createOrReplace();
 
       System.out.println("Watching for changes to Dummies");
-      dummyClient.withResourceVersion(created.getMetadata().getResourceVersion()).watch(new Watcher<Dummy>() {
+      Watch watch = dummyClient.withResourceVersion(created.getMetadata().getResourceVersion()).watch(new Watcher<Dummy>() {
         @Override
         public void eventReceived(Action action, Dummy resource) {
           System.out.println("==> " + action + " for " + resource);
@@ -182,6 +183,7 @@ public void onClose(WatcherException cause) {
 
       System.in.read();
 
+      watch.close();
     } catch (KubernetesClientException e) {
       logger.error(e.getMessage(), e);
     } catch (Exception e) {

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CRDLoadExample.java

@@ -15,8 +15,8 @@
  */
 package io.fabric8.kubernetes.examples;
 
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import org.slf4j.Logger;
@@ -30,17 +30,17 @@ public static void main(String[] args) {
     try (final KubernetesClient client = new KubernetesClientBuilder().build()) {
       // List all Custom resources.
       logger.info("Listing all current Custom Resource Definitions :");
-      CustomResourceDefinitionList crdList = client.apiextensions().v1beta1().customResourceDefinitions().list();
+      CustomResourceDefinitionList crdList = client.apiextensions().v1().customResourceDefinitions().list();
       crdList.getItems().forEach(crd -> logger.info(crd.getMetadata().getName()));
 
       // Creating a custom resource from yaml
-      CustomResourceDefinition aCustomResourceDefinition = client.apiextensions().v1beta1().customResourceDefinitions()
-          .load(CRDLoadExample.class.getResourceAsStream("/crd.yml")).get();
+      CustomResourceDefinition aCustomResourceDefinition = client.apiextensions().v1().customResourceDefinitions()
+          .load(CRDLoadExample.class.getResourceAsStream("/crd.yml")).item();
       logger.info("Creating CRD...");
-      client.apiextensions().v1beta1().customResourceDefinitions().create(aCustomResourceDefinition);
+      client.apiextensions().v1().customResourceDefinitions().resource(aCustomResourceDefinition).create();
 
       logger.info("Updated Custom Resource Definitions: ");
-      client.apiextensions().v1beta1().customResourceDefinitions().list().getItems()
+      client.apiextensions().v1().customResourceDefinitions().list().getItems()
           .forEach(crd -> logger.info(crd.getMetadata().getName()));
 
     }

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ConfigMapExample.java

@@ -49,10 +49,12 @@ public static void main(String[] args) {
       }
 
       String name = "cheese";
-      Resource<ConfigMap> configMapResource = client.configMaps().inNamespace(namespace).withName(name);
+      Resource<ConfigMap> configMapResource = client.configMaps().inNamespace(namespace)
+          .resource(new ConfigMapBuilder().withNewMetadata().withName(name)
+              .endMetadata().addToData("foo", "" + new Date()).addToData("bar", "beer")
+              .build());
 
-      ConfigMap configMap = configMapResource.createOrReplace(new ConfigMapBuilder().withNewMetadata().withName(name)
-          .endMetadata().addToData("foo", "" + new Date()).addToData("bar", "beer").build());
+      ConfigMap configMap = configMapResource.createOrReplace();
 
       logger.info("Upserted ConfigMap at {} data {}", configMap.getMetadata().getSelfLink(), configMap.getData());
 

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CreatePod.java

@@ -62,7 +62,7 @@ public static void main(String[] args) {
         namespace = client.getNamespace();
       }
 
-      List<HasMetadata> resources = client.load(new FileInputStream(fileName)).get();
+      List<HasMetadata> resources = client.load(new FileInputStream(fileName)).items();
       if (resources.isEmpty()) {
         logger.error("No resources loaded from file: {}", fileName);
         return;
@@ -72,7 +72,7 @@ public static void main(String[] args) {
         Pod pod = (Pod) resource;
         logger.info("Creating pod in namespace {}", namespace);
         NonNamespaceOperation<Pod, PodList, PodResource> pods = client.pods().inNamespace(namespace);
-        Pod result = pods.create(pod);
+        Pod result = pods.resource(pod).create();
         logger.info("Created pod {}", result.getMetadata().getName());
       } else {
         logger.error("Loaded resource is not a Pod! {}", resource);

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java

@@ -70,12 +70,12 @@ public static void main(String[] args) {
           .build();
 
       log("Creating cron job from object");
-      cronJob1 = client.batch().v1().cronjobs().inNamespace(namespace).create(cronJob1);
+      cronJob1 = client.batch().v1().cronjobs().inNamespace(namespace).resource(cronJob1).create();
       log("Successfully created cronjob with name ", cronJob1.getMetadata().getName());
 
       log("Watching over pod which would be created during cronjob execution...");
       final CountDownLatch watchLatch = new CountDownLatch(1);
-      try (Watch watch = client.pods().inNamespace(namespace).withLabel("job-name").watch(new Watcher<Pod>() {
+      try (Watch ignored = client.pods().inNamespace(namespace).withLabel("job-name").watch(new Watcher<Pod>() {
         @Override
         public void eventReceived(Action action, Pod aPod) {
           log(aPod.getMetadata().getName(), aPod.getStatus().getPhase());
@@ -91,8 +91,11 @@ public void onClose(WatcherException e) {
         }
       })) {
         watchLatch.await(2, TimeUnit.MINUTES);
-      } catch (KubernetesClientException | InterruptedException e) {
-        log("Could not watch pod", e);
+      } catch (InterruptedException interruptedException) {
+        Thread.currentThread().interrupt();
+        log("Could not watch pod", interruptedException);
+      } catch (KubernetesClientException kubernetesClientException) {
+        log("Could not watch pod", kubernetesClientException);
       }
     } catch (KubernetesClientException exception) {
       log("An error occured while processing cronjobs:", exception.getMessage());

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CustomResourceInformerExample.java

@@ -89,9 +89,10 @@ public void onDelete(Dummy pod, boolean deletedFinalStateUnknown) {
             .map(HasMetadata::getMetadata).map(ObjectMeta::getNamespace).orElse("default"));
       }
 
-      client.resources(Dummy.class).createOrReplace(toCreate);
+      client.resources(Dummy.class).resource(toCreate).createOrReplace();
       // Wait for some time now
       TimeUnit.MINUTES.sleep(5);
+      podInformer.close();
     } catch (InterruptedException interruptedException) {
       Thread.currentThread().interrupt();
       logger.warn("interrupted: {}", interruptedException.getMessage());

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CustomResourceV1Example.java

@@ -51,14 +51,14 @@ public static void main(String... args) {
           .endOpenAPIV3Schema().endSchema()
         .endVersion().endSpec().build();
       // @formatter:on
-      kc.apiextensions().v1().customResourceDefinitions().createOrReplace(crd);
+      kc.apiextensions().v1().customResourceDefinitions().resource(crd).createOrReplace();
       System.out.println("Created custom shows.example.com Kubernetes API");
       final NonNamespaceOperation<Show, ShowList, Resource<Show>> shows = kc.resources(Show.class, ShowList.class)
           .inNamespace("default");
       shows.list();
-      shows.createOrReplace(new Show("breaking-bad", new ShowSpec("Breaking Bad", 10)));
-      shows.createOrReplace(new Show("better-call-saul", new ShowSpec("Better call Saul", 8)));
-      shows.createOrReplace(new Show("the-wire", new ShowSpec("The Wire", 10)));
+      shows.resource(new Show("breaking-bad", new ShowSpec("Breaking Bad", 10))).createOrReplace();
+      shows.resource(new Show("better-call-saul", new ShowSpec("Better call Saul", 8))).createOrReplace();
+      shows.resource(new Show("the-wire", new ShowSpec("The Wire", 10))).createOrReplace();
       System.out.println("Added three shows");
       shows.list().getItems()
           .forEach(s -> System.out.printf(" - %s%n", s.getSpec().name));

kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/DeleteExamples.java

@@ -31,8 +31,9 @@ public class DeleteExamples {
   public static void main(String[] args) {
     try (KubernetesClient client = new KubernetesClientBuilder().build()) {
       try {
-        logger.info("Create namespace: {}", client.namespaces().create(
-            new NamespaceBuilder().withNewMetadata().withName(NAMESPACE).endMetadata().build()));
+        logger.info("Create namespace: {}", client.namespaces()
+            .resource(new NamespaceBuilder().withNewMetadata().withName(NAMESPACE).endMetadata().build())
+            .create());
         logger.info("Deleted namespace: {}", client.namespaces().withName(NAMESPACE).delete());
         logger.info("Deleted testPod: {}", client.pods().inNamespace(NAMESPACE).withName("test-pod").delete());
         logger.info("Deleted pod by label: {}", client.pods().withLabel("this", "works").delete());