Update examples to use new API

fabric8io · Apr 16, 2021 · 9e50cf4 · 9e50cf4
1 parent 7bfcc9e
commit 9e50cf4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java
@@ -17,8 +17,8 @@
 package io.fabric8.kubernetes.examples;
 
 import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob;
-import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobBuilder;
+import io.fabric8.kubernetes.api.model.batch.v1.CronJob;
+import io.fabric8.kubernetes.api.model.batch.v1.CronJobBuilder;
 import io.fabric8.kubernetes.client.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ public static void main(String[] args) {
         .build();
 
       log("Creating cron job from object");
-      cronJob1 = client.batch().cronjobs().inNamespace(namespace).create(cronJob1);
+      cronJob1 = client.batch().v1().cronjobs().inNamespace(namespace).create(cronJob1);
       log("Successfully created cronjob with name ", cronJob1.getMetadata().getName());
 
       log("Watching over pod which would be created during cronjob execution...");

diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/FullExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/FullExample.java
@@ -74,7 +74,7 @@ public void onClose(WatcherException e) {
                 log("Create resource quota", client.resourceQuotas().inNamespace("thisisatest").create(quota));
 
                 try {
-                  log("Get jobs in namespace", client.batch().jobs().inNamespace("thisisatest").list());
+                  log("Get jobs in namespace", client.batch().v1().jobs().inNamespace("thisisatest").list());
                 } catch (APIGroupNotAvailableException e) {
                   log("Skipping jobs example - extensions API group not available");
                 }

diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/JobExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/JobExample.java
@@ -60,7 +60,7 @@ public static void main(String[] args) {
             .build();
 
           logger.info("Creating job pi.");
-          client.batch().jobs().inNamespace(namespace).createOrReplace(job);
+          client.batch().v1().jobs().inNamespace(namespace).createOrReplace(job);
 
           // Get All pods created by the job
           PodList podList = client.pods().inNamespace(namespace).withLabel("job-name", job.getMetadata().getName()).list();
@@ -69,7 +69,7 @@ public static void main(String[] args) {
             .waitUntilCondition(pod -> pod.getStatus().getPhase().equals("Succeeded"), 1, TimeUnit.MINUTES);
 
           // Print Job's log
-          String joblog = client.batch().jobs().inNamespace(namespace).withName("pi").getLog();
+          String joblog = client.batch().v1().jobs().inNamespace(namespace).withName("pi").getLog();
           logger.info(joblog);
 
         } catch (KubernetesClientException e) {

diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/NamespaceQuotaExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/NamespaceQuotaExample.java
@@ -64,7 +64,7 @@ public static void main(String[] args) {
 
         try {
           logger.info("Listing jobs in namespace");
-          client.batch().jobs().inNamespace(namespace).list().getItems()
+          client.batch().v1().jobs().inNamespace(namespace).list().getItems()
             .forEach(j -> logger.info(" - {}", j.getMetadata().getName()));
         } catch (APIGroupNotAvailableException e) {
           logger.warn("Skipping jobs example - extensions API group not available");

diff --git a/...tes-examples/src/main/java/io/fabric8/kubernetes/examples/PodDisruptionBudgetExample.java b/...tes-examples/src/main/java/io/fabric8/kubernetes/examples/PodDisruptionBudgetExample.java
@@ -16,8 +16,8 @@
 package io.fabric8.kubernetes.examples;
 
 import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget;
-import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetBuilder;
+import io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget;
+import io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetBuilder;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -49,7 +49,7 @@ public static void main(String[] args) {
         .build();
 
       logger.info("Current namespace is {}", namespace);
-      client.policy().podDisruptionBudget().inNamespace(namespace).createOrReplace(podDisruptionBudget);
+      client.policy().v1().podDisruptionBudget().inNamespace(namespace).createOrReplace(podDisruptionBudget);
 
     } catch (KubernetesClientException e) {
       logger.error("Could not create resource: {}", e.getMessage(), e);

diff --git a/...netes-examples/src/main/java/io/fabric8/kubernetes/examples/PodSecurityPolicyExample.java b/...netes-examples/src/main/java/io/fabric8/kubernetes/examples/PodSecurityPolicyExample.java
@@ -40,18 +40,18 @@ public static void main(String[] args) {
       final String localYamlToCreate = "/PodSecurityPolicy.yml";
       logger.info("Creating PodSecurityPolicy from Yaml file: {}", localYamlToCreate);
       try (final InputStream localYamlStream = PodSecurityPolicyExample.class.getResourceAsStream(localYamlToCreate)) {
-        final PodSecurityPolicy podSecurityPolicy = client.policy().podSecurityPolicies().load(localYamlStream).get();
-        client.policy().podSecurityPolicies().withName(podSecurityPolicy.getMetadata().getName()).delete();
-        client.policy().podSecurityPolicies().withName(podSecurityPolicy.getMetadata().getName())
+        final PodSecurityPolicy podSecurityPolicy = client.policy().v1beta1().podSecurityPolicies().load(localYamlStream).get();
+        client.policy().v1beta1().podSecurityPolicies().withName(podSecurityPolicy.getMetadata().getName()).delete();
+        client.policy().v1beta1().podSecurityPolicies().withName(podSecurityPolicy.getMetadata().getName())
           .waitUntilCondition(Objects::isNull, 5, TimeUnit.SECONDS);
-        client.policy().podSecurityPolicies().create(podSecurityPolicy);
+        client.policy().v1beta1().podSecurityPolicies().create(podSecurityPolicy);
         logger.info("PodSecurityPolicy created with Name : {}", podSecurityPolicy.getMetadata().getName());
       }
 
       logger.info("Starting creating PodSecurityPolicy programmatically");
       final String podSecurityPolicyName = "example2";
-      client.policy().podSecurityPolicies().withName(podSecurityPolicyName).delete();
-      client.policy().podSecurityPolicies().withName(podSecurityPolicyName)
+      client.policy().v1beta1().podSecurityPolicies().withName(podSecurityPolicyName).delete();
+      client.policy().v1beta1().podSecurityPolicies().withName(podSecurityPolicyName)
         .waitUntilCondition(Objects::isNull, 5, TimeUnit.SECONDS);
       final PodSecurityPolicy programmaticPodSecurityPolicy = new PodSecurityPolicyBuilder().withNewMetadata()
         .withName(podSecurityPolicyName)
@@ -64,7 +64,7 @@ public static void main(String[] args) {
         .withNewSupplementalGroups().withRule("RunAsAny").endSupplementalGroups()
         .endSpec()
         .build();
-      client.policy().podSecurityPolicies().create(programmaticPodSecurityPolicy);
+      client.policy().v1beta1().podSecurityPolicies().create(programmaticPodSecurityPolicy);
       logger.info("PodSecurityPolicy created with Name: {}", programmaticPodSecurityPolicy.getMetadata().getName());
     } catch (KubernetesClientException clientException) {
       logger.error("Problem encountered with Kubernetes client!!", clientException);