This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit ba4d7dc7900860395ea4cd6b66277b2e88f3066f Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Oct 2 12:24:30 2020 +0200 Upgrade Kubernetes Client and model to version 4.12.0 --- components/camel-infinispan/pom.xml | 1 - .../config_maps/KubernetesConfigMapsConsumer.java | 5 +- .../config_maps/KubernetesConfigMapsProducer.java | 3 +- .../kubernetes/hpa/KubernetesHPAProducer.java | 8 +-- .../kubernetes/job/KubernetesJobProducer.java | 8 +-- .../KubernetesPersistentVolumesClaimsProducer.java | 6 +- .../kubernetes/pods/KubernetesPodsProducer.java | 3 +- .../KubernetesReplicationControllersProducer.java | 3 +- .../secrets/KubernetesSecretsProducer.java | 5 +- .../KubernetesServiceAccountsProducer.java | 5 +- .../services/KubernetesServicesProducer.java | 5 +- .../OpenshiftBuildConfigsProducer.java | 5 +- .../openshift/builds/OpenshiftBuildsProducer.java | 3 +- .../cluster/utils/LockTestServerTest.java | 70 ---------------------- parent/pom.xml | 4 +- 15 files changed, 27 insertions(+), 107 deletions(-) diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml index f60c061..fe52a83 100644 --- a/components/camel-infinispan/pom.xml +++ b/components/camel-infinispan/pom.xml @@ -73,7 +73,6 @@ <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> <version>${infinispan-version}</version> diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java index acad692..9088f7b 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java @@ -89,7 +89,8 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer { @Override public void run() { - FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>> w = null; + + FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch> w = null; if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey()) && ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue())) { w = getEndpoint().getKubernetesClient().configMaps().withLabel( @@ -97,7 +98,7 @@ public class KubernetesConfigMapsConsumer extends DefaultConsumer { getEndpoint().getKubernetesConfiguration().getLabelValue()); } if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName())) { - w = (FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>>) getEndpoint() + w = (FilterWatchListDeletable<ConfigMap, ConfigMapList, Boolean, Watch>) getEndpoint() .getKubernetesClient().configMaps() .withName(getEndpoint().getKubernetesConfiguration().getResourceName()); } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java index b72a0ea..192292e 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java @@ -23,7 +23,6 @@ import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapList; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import org.apache.camel.Exchange; import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; @@ -95,7 +94,7 @@ public class KubernetesConfigMapsProducer extends DefaultProducer { protected void doListConfigMapsByLabels(Exchange exchange, String operation) throws Exception { ConfigMapList configMapsList = null; Map<String, String> labels = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS, Map.class); - FilterWatchListMultiDeletable<ConfigMap, ConfigMapList, Boolean, Watch, Watcher<ConfigMap>> configMaps + FilterWatchListMultiDeletable<ConfigMap, ConfigMapList, Boolean, Watch> configMaps = getEndpoint().getKubernetesClient().configMaps().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { configMaps.withLabel(entry.getKey(), entry.getValue()); diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java index cb301f4..8dcb595 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java @@ -18,13 +18,13 @@ package org.apache.camel.component.kubernetes.hpa; import java.util.Map; +import io.fabric8.kubernetes.api.model.autoscaling.v1.DoneableHorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerBuilder; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec; -import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; -import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; +import io.fabric8.kubernetes.client.dsl.MixedOperation; +import io.fabric8.kubernetes.client.dsl.Resource; import org.apache.camel.Exchange; import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -100,7 +100,7 @@ public class KubernetesHPAProducer extends DefaultProducer { throw new IllegalArgumentException("Get HPA by labels require specify a labels set"); } - FilterWatchListMultiDeletable<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Boolean, Watch, Watcher<HorizontalPodAutoscaler>> hpas + MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> hpas = getEndpoint() .getKubernetesClient().autoscaling().v1().horizontalPodAutoscalers(); for (Map.Entry<String, String> entry : labels.entrySet()) { diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java index aa1083f..73b87dc 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java @@ -18,13 +18,13 @@ package org.apache.camel.component.kubernetes.job; import java.util.Map; +import io.fabric8.kubernetes.api.model.batch.DoneableJob; import io.fabric8.kubernetes.api.model.batch.Job; import io.fabric8.kubernetes.api.model.batch.JobBuilder; import io.fabric8.kubernetes.api.model.batch.JobList; import io.fabric8.kubernetes.api.model.batch.JobSpec; -import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; -import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; +import io.fabric8.kubernetes.client.dsl.MixedOperation; +import io.fabric8.kubernetes.client.dsl.ScalableResource; import org.apache.camel.Exchange; import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; import org.apache.camel.component.kubernetes.KubernetesConstants; @@ -99,7 +99,7 @@ public class KubernetesJobProducer extends DefaultProducer { throw new IllegalArgumentException("Get Job by labels require specify a labels set"); } - FilterWatchListMultiDeletable<Job, JobList, Boolean, Watch, Watcher<Job>> jobs + MixedOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>> jobs = getEndpoint().getKubernetesClient().batch().jobs(); for (Map.Entry<String, String> entry : labels.entrySet()) { jobs.withLabel(entry.getKey(), entry.getValue()); diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java index cba2d1a..70d0ac2 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java @@ -24,7 +24,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder; import io.fabric8.kubernetes.api.model.PersistentVolumeClaimList; import io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -110,9 +109,8 @@ public class KubernetesPersistentVolumesClaimsProducer extends DefaultProducer { } pvcList = pvcs.list(); } else { - FilterWatchListMultiDeletable<PersistentVolumeClaim, PersistentVolumeClaimList, Boolean, Watch, Watcher<PersistentVolumeClaim>> pvcs - = getEndpoint() - .getKubernetesClient().persistentVolumeClaims().inAnyNamespace(); + FilterWatchListMultiDeletable<PersistentVolumeClaim, PersistentVolumeClaimList, Boolean, Watch> pvcs = getEndpoint() + .getKubernetesClient().persistentVolumeClaims().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { pvcs.withLabel(entry.getKey(), entry.getValue()); } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java index df74f34..9bc7709 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java @@ -23,7 +23,6 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.api.model.PodSpec; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import org.apache.camel.Exchange; import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint; @@ -104,7 +103,7 @@ public class KubernetesPodsProducer extends DefaultProducer { throw new IllegalArgumentException("Get pods by labels require specify a labels set"); } - FilterWatchListMultiDeletable<Pod, PodList, Boolean, Watch, Watcher<Pod>> pods + FilterWatchListMultiDeletable<Pod, PodList, Boolean, Watch> pods = getEndpoint().getKubernetesClient().pods().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { pods.withLabel(entry.getKey(), entry.getValue()); diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java index f562d51..f480284 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java @@ -24,7 +24,6 @@ import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder; import io.fabric8.kubernetes.api.model.ReplicationControllerList; import io.fabric8.kubernetes.api.model.ReplicationControllerSpec; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.RollableScalableResource; @@ -120,7 +119,7 @@ public class KubernetesReplicationControllersProducer extends DefaultProducer { } rcList = replicationControllers.list(); } else { - FilterWatchListMultiDeletable<ReplicationController, ReplicationControllerList, Boolean, Watch, Watcher<ReplicationController>> replicationControllers + FilterWatchListMultiDeletable<ReplicationController, ReplicationControllerList, Boolean, Watch> replicationControllers = getEndpoint() .getKubernetesClient().replicationControllers().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java index 1e89a85..e5e0586 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java @@ -22,7 +22,6 @@ import io.fabric8.kubernetes.api.model.DoneableSecret; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretList; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -104,8 +103,8 @@ public class KubernetesSecretsProducer extends DefaultProducer { } secretsList = secrets.list(); } else { - FilterWatchListMultiDeletable<Secret, SecretList, Boolean, Watch, Watcher<Secret>> secrets; - secrets = getEndpoint().getKubernetesClient().secrets().inAnyNamespace(); + FilterWatchListMultiDeletable<Secret, SecretList, Boolean, Watch> secrets + = getEndpoint().getKubernetesClient().secrets().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { secrets.withLabel(entry.getKey(), entry.getValue()); } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java index 6961538..03c92bd 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java @@ -22,7 +22,6 @@ import io.fabric8.kubernetes.api.model.DoneableServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccountList; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -105,8 +104,8 @@ public class KubernetesServiceAccountsProducer extends DefaultProducer { } saList = serviceAccounts.list(); } else { - FilterWatchListMultiDeletable<ServiceAccount, ServiceAccountList, Boolean, Watch, Watcher<ServiceAccount>> serviceAccounts; - serviceAccounts = getEndpoint().getKubernetesClient().serviceAccounts().inAnyNamespace(); + FilterWatchListMultiDeletable<ServiceAccount, ServiceAccountList, Boolean, Watch> serviceAccounts + = getEndpoint().getKubernetesClient().serviceAccounts().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { serviceAccounts.withLabel(entry.getKey(), entry.getValue()); } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java index 621a5f9..cbd93b3 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java @@ -24,7 +24,6 @@ import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServiceList; import io.fabric8.kubernetes.api.model.ServiceSpec; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.ServiceResource; @@ -112,8 +111,8 @@ public class KubernetesServicesProducer extends DefaultProducer { } servicesList = services.list(); } else { - FilterWatchListMultiDeletable<Service, ServiceList, Boolean, Watch, Watcher<Service>> services; - services = getEndpoint().getKubernetesClient().services().inAnyNamespace(); + FilterWatchListMultiDeletable<Service, ServiceList, Boolean, Watch> services + = getEndpoint().getKubernetesClient().services().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { services.withLabel(entry.getKey(), entry.getValue()); } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java index 6454e77..d719b7e 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsProducer.java @@ -19,7 +19,6 @@ package org.apache.camel.component.openshift.build_configs; import java.util.Map; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.openshift.api.model.Build; @@ -99,8 +98,8 @@ public class OpenshiftBuildConfigsProducer extends DefaultProducer { } buildConfigsList = buildConfigs.list(); } else { - FilterWatchListMultiDeletable<BuildConfig, BuildConfigList, Boolean, Watch, Watcher<BuildConfig>> buildConfigs; - buildConfigs = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inAnyNamespace(); + FilterWatchListMultiDeletable<BuildConfig, BuildConfigList, Boolean, Watch> buildConfigs + = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { buildConfigs.withLabel(entry.getKey(), entry.getValue()); } diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java index edf505c..36248f9 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsProducer.java @@ -19,7 +19,6 @@ package org.apache.camel.component.openshift.builds; import java.util.Map; import io.fabric8.kubernetes.client.Watch; -import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.LogWatch; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; @@ -98,7 +97,7 @@ public class OpenshiftBuildsProducer extends DefaultProducer { } buildList = builds.list(); } else { - FilterWatchListMultiDeletable<Build, BuildList, Boolean, Watch, Watcher<Build>> builds + FilterWatchListMultiDeletable<Build, BuildList, Boolean, Watch> builds = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).builds() .inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java deleted file mode 100644 index 307ac48..0000000 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.kubernetes.cluster.utils; - -import io.fabric8.kubernetes.api.model.ConfigMap; -import io.fabric8.kubernetes.api.model.ConfigMapBuilder; -import io.fabric8.kubernetes.client.KubernetesClient; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - -/** - * Basic tests on the lock test server. - */ -public class LockTestServerTest { - - @Test - public void test() { - ConfigMapLockSimulator lock = new ConfigMapLockSimulator("xxx"); - LockTestServer server = new LockTestServer(lock); - KubernetesClient client = server.createClient(); - - assertNull(client.configMaps().withName("xxx").get()); - - client.configMaps().withName("xxx").createNew().withNewMetadata().withName("xxx").and().done(); - - assertThrows(Exception.class, - () -> client.configMaps().withName("xxx").createNew().withNewMetadata().withName("xxx").and().done(), - "Should have failed for duplicate insert"); - - client.configMaps().withName("xxx").createOrReplaceWithNew().editOrNewMetadata().withName("xxx").addToLabels("a", "b") - .and().done(); - - ConfigMap map = client.configMaps().withName("xxx").get(); - assertEquals("b", map.getMetadata().getLabels().get("a")); - - client.configMaps().withName("xxx").lockResourceVersion(map.getMetadata().getResourceVersion()) - .replace(new ConfigMapBuilder(map).editOrNewMetadata().withName("xxx").addToLabels("c", "d").and().build()); - - ConfigMap newMap = client.configMaps().withName("xxx").get(); - assertEquals("d", newMap.getMetadata().getLabels().get("c")); - - assertThrows(Exception.class, - () -> client.configMaps().withName("xxx").lockResourceVersion(map.getMetadata().getResourceVersion()) - .replace(new ConfigMapBuilder(map).editOrNewMetadata().withName("xxx").addToLabels("e", "f").and() - .build()), - "Should have failed for wrong version"); - - ConfigMap newMap2 = client.configMaps().withName("xxx").get(); - assertNull(newMap2.getMetadata().getLabels().get("e")); - - } - -} diff --git a/parent/pom.xml b/parent/pom.xml index 894c7aa..7640370 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -363,8 +363,8 @@ <jzlib-version>1.1.3</jzlib-version> <kafka-version>2.6.0</kafka-version> <kie-version>7.43.1.Final</kie-version> - <kubernetes-client-version>4.10.3</kubernetes-client-version> - <kubernetes-model-version>4.10.3</kubernetes-model-version> + <kubernetes-client-version>4.12.0</kubernetes-client-version> + <kubernetes-model-version>4.12.0</kubernetes-model-version> <kudu-version>1.12.0</kudu-version> <leveldbjni-version>1.8</leveldbjni-version> <leveldb-api-version>0.10</leveldb-api-version>
