updating to latest sundrio

fabric8io · Jul 5, 2023 · bc5dbaf · bc5dbaf
1 parent 449d06b
commit bc5dbaf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/...a/io/fabric8/crd/generator/v1/decorator/AddCustomResourceDefinitionResourceDecorator.java b/...a/io/fabric8/crd/generator/v1/decorator/AddCustomResourceDefinitionResourceDecorator.java
@@ -49,7 +49,7 @@ public AddCustomResourceDefinitionResourceDecorator(String name, String apiGroup
 
   @Override
   public void visit(KubernetesListBuilder list) {
-    boolean exists = list.getItems().stream().anyMatch(i -> i.getKind().equals("CustomResourceDefinition")
+    boolean exists = list.buildItems().stream().anyMatch(i -> i.getKind().equals("CustomResourceDefinition")
         && i.getMetadata().getName().equals(name)
         && ApiVersionUtil.trimVersion(i.getApiVersion()).equals("v1"));
 

diff --git a/...fabric8/crd/generator/v1beta1/decorator/AddCustomResourceDefinitionResourceDecorator.java b/...fabric8/crd/generator/v1beta1/decorator/AddCustomResourceDefinitionResourceDecorator.java
@@ -49,7 +49,7 @@ public AddCustomResourceDefinitionResourceDecorator(String name, String apiGroup
 
   @Override
   public void visit(KubernetesListBuilder list) {
-    boolean exists = list.getItems().stream().anyMatch(i -> i.getKind().equals("CustomResourceDefinition")
+    boolean exists = list.buildItems().stream().anyMatch(i -> i.getKind().equals("CustomResourceDefinition")
         && i.getMetadata().getName().equals(name)
         && ApiVersionUtil.trimVersion(i.getApiVersion()).equals("v1beta1"));
 

diff --git a/...tes-client-api/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperations.java b/...tes-client-api/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperations.java
@@ -22,19 +22,12 @@
 
 public class RunOperations {
 
-  public interface RunConfigNested extends RunConfigFluent<RunConfigNested> {
+  public class RunConfigNested extends RunConfigFluent<RunConfigNested> {
 
-    Pod done();
-
-  }
-
-  private class RunConfigNestedImpl extends RunConfigFluentImpl<RunConfigNested> implements RunConfigNested {
-
-    RunConfigNestedImpl() {
+    RunConfigNested() {
       super(runConfig); // copy the existing properties
     }
 
-    @Override
     public Pod done() {
       RunConfig runConfig = new RunConfigBuilder(this).build();
       return withRunConfig(runConfig).done();
@@ -102,7 +95,7 @@ public RunOperations withRunConfig(RunConfig generatorRunConfig) {
    * @return
    */
   public RunConfigNested withNewRunConfig() {
-    return new RunConfigNestedImpl();
+    return new RunConfigNested();
   }
 
   /**

diff --git a/...tests/src/test/java/io/fabric8/kubernetes/client/mock/DefaultSharedIndexInformerTest.java b/...tests/src/test/java/io/fabric8/kubernetes/client/mock/DefaultSharedIndexInformerTest.java
@@ -90,7 +90,7 @@ class DefaultSharedIndexInformerTest {
           "410: The event in requested index is outdated and cleared (the requested history has been cleared [3/1]) [2]")
       .build();
   static final WatchEvent outdatedEvent = new WatchEventBuilder().withType(Watcher.Action.ERROR.name())
-      .withStatusObject(outdatedStatus)
+      .withObject(outdatedStatus)
       .build();
   static final Long WATCH_EVENT_EMIT_TIME = 1L;
   static final Long OUTDATED_WATCH_EVENT_EMIT_TIME = 1L;

diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/WatchTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/WatchTest.java
@@ -323,7 +323,7 @@ public void onClose(WatcherException cause) {
 
   private static WatchEvent outdatedEvent() {
     return new WatchEventBuilder().withType(Watcher.Action.ERROR.name())
-        .withStatusObject(
+        .withObject(
             new StatusBuilder().withCode(HttpURLConnection.HTTP_GONE)
                 .withMessage(
                     "410: The event in requested index is outdated and cleared (the requested history has been cleared [3/1]) [2]")

diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Core versions -->
-    <sundrio.version>0.95.0</sundrio.version>
+    <sundrio.version>0.100.1</sundrio.version>
     <okhttp.version>3.12.12</okhttp.version>
     <okhttp.bundle.version>3.12.1_1</okhttp.bundle.version>
     <okio.version>1.15.0</okio.version>