Commit 497c9b06 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '22-kubernetes-1.33' into 'develop' 

Update fabric8 kubernetes client to fix kubernetes 1.33 support

See merge request !24
parents 17d292c0 a10b39d3

pom.xml

+4 −4
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<spring.boot-version>3.2.2</spring.boot-version>

		<fabric8.version>6.10.0</fabric8.version>

		<spring.boot-version>3.5.4</spring.boot-version>

		<fabric8.version>7.3.1</fabric8.version>

		 

		<!--

		<spring.boot-version>${spring-boot-version}</spring.boot-version>

src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java

+5 −4
Original line number Diff line number Diff line 
package org.etsi.osl.cridge;



import static io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext.v1CRDFromCustomResourceType;

import static org.junit.Assert.assertNotNull;

import static org.junit.jupiter.api.Assertions.assertEquals;

import static org.junit.jupiter.api.Assertions.assertNotNull;

import java.io.BufferedInputStream;

import java.io.FileInputStream;

import java.io.FileNotFoundException;
@@ -42,12 +42,12 @@ import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; 
import io.fabric8.kubernetes.api.model.Secret;

import io.fabric8.kubernetes.api.model.SecretBuilder;

import io.fabric8.kubernetes.api.model.ServiceList;

import io.fabric8.kubernetes.api.model.StatusBuilder;

import io.fabric8.kubernetes.api.model.WatchEvent;

import io.fabric8.kubernetes.api.model.WatchEventBuilder;

import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;

import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;

import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionListBuilder;

import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionRequestFluent.V1beta1ServiceReferenceObjectsNested;

import io.fabric8.kubernetes.client.Config;

import io.fabric8.kubernetes.client.KubernetesClient;

import io.fabric8.kubernetes.client.KubernetesClientBuilder;
@@ -324,9 +324,10 @@ public class CridgeIntegrationTest { 
        "/apis/examples.osl.etsi.org/v1alpha1/namespaces/orderid-xxx-xxx-xxx/mycalculators?allowWatchBookmarks=true&watch=true")

        .andUpgradeToWebSocket().open().waitFor(10L)

        .andEmit(new WatchEvent(getMyCalculator("amycalculator"), "ADDED")).waitFor(20L)

        .andEmit(new WatchEventBuilder().withNewStatusObject()

        .andEmit(new WatchEvent(new StatusBuilder()

            .withMessage("410 - the event requested is outdated")

            .withCode(HttpURLConnection.HTTP_GONE).endStatusObject().build())

            .withCode(HttpURLConnection.HTTP_GONE)

            .build(), null))

        .done().always();



    MixedOperation<MyCalculator, KubernetesResourceList<MyCalculator>, Resource<MyCalculator>> userAclClient =