Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: removed SupportTestingClient interface #6611

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@

#### _**Note**_: Breaking changes
* Check detailed migration documentation for breaking changes in [7.0.0](./doc/MIGRATION-v7.md)
* Fix #4659: Removed `SupportTestingClient` interface
* Fix #5264: `Config.errorMessages` has been removed. Please use Kubernetes status messages directly.
* Fix #5351: Removed deprecated `io.fabric8:openshift-server-mock` artifact
* Fix #6081: Moved Java baseline from 8 (1.8) to 11
* Fix #6138: Removed unused `io:fabric8:kubernetes-model` artifact
* Fix #5351: Removed deprecated `io.fabric8:openshift-server-mock` artifact
* Fix #6156: Removed deprecated extension `io:fabric8:service-catalog`
* Fix #6158: Removed deprecated methods from `io.fabric8.kubernetes.client.utils.IOHelpers`
* Fix #6361: Renamed SettableBeanPropertyDelegate to SettableBeanPropertyDelegating
Expand Down
9 changes: 9 additions & 0 deletions doc/MIGRATION-v7.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- [Deprecations and Removals](#deprecations-and-removals)
- [Apache Felix SCR Annotations removed](#apache-felix-scr-annotations)
- [OpenShift Server Mock removed](#openshift-server-mock-removed)
- [SupportTestingClient removed](#supporttestingclient-removed)
- [Service Catalog API (extension) removed](#service-catalog-extension)


Expand Down Expand Up @@ -272,6 +273,14 @@ The usage of the `@EnableOpenShiftMockClient` annotation should be replaced with

The use of the `OpenShiftMockServer` class should be replaced with the `KubernetesMockServer` class.

### SupportTestingClient removed <a href="#supporttestingclient-removed" id="supporttestingclient-removed"/>

The deprecated interface `SupportTestingClient` has been removed from the project.

The method `client.isSupported` is no longer available.
You can replace it with the `Client.hasApiGroup` method or one of the `Client.supports` alternative methods.
For OpenShift, you can also leverage the `OpenShiftClient.supportsOpenShiftAPIGroup` method.

### Service Catalog API (extension) removed <a href="#service-catalog-extension" id="service-catalog-extension"/>

The Service Catalog API extension has been removed.
Expand Down
5 changes: 0 additions & 5 deletions extensions/chaosmesh/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<artifactId>kubernetes-client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
import io.fabric8.kubernetes.client.extension.SupportTestingClient;

public class DefaultChaosMeshClient extends ExtensionRootClientAdapter<DefaultChaosMeshClient>
implements NamespacedChaosMeshClient, SupportTestingClient {
implements NamespacedChaosMeshClient {

public DefaultChaosMeshClient() {
super();
Expand Down Expand Up @@ -134,8 +133,4 @@ public MixedOperation<AWSChaos, AWSChaosList, Resource<AWSChaos>> awsChaos() {
return resources(AWSChaos.class, AWSChaosList.class);
}

@Override
public boolean isSupported() {
return hasApiGroup("chaos-mesh.org", false);
}
}

This file was deleted.

5 changes: 0 additions & 5 deletions extensions/istio/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@
<artifactId>kubernetes-client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
import io.fabric8.kubernetes.client.WithRequestCallable;
import io.fabric8.kubernetes.client.dsl.FunctionCallable;
import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
import io.fabric8.kubernetes.client.extension.SupportTestingClient;

public class DefaultIstioClient extends ExtensionRootClientAdapter<DefaultIstioClient>
implements NamespacedIstioClient, SupportTestingClient {
implements NamespacedIstioClient {

public DefaultIstioClient() {
super();
Expand Down Expand Up @@ -57,9 +56,4 @@ public V1alpha3APIGroupDSL v1alpha3() {
public V1beta1APIGroupDSL v1beta1() {
return adapt(V1beta1APIGroupClient.class);
}

@Override
public boolean isSupported() {
return hasApiGroup("istio.io", false);
}
}

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions extensions/knative/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@
<artifactId>kubernetes-client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,9 @@
import io.fabric8.kubernetes.client.dsl.MixedOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
import io.fabric8.kubernetes.client.extension.SupportTestingClient;

public class DefaultKnativeClient extends ExtensionRootClientAdapter<DefaultKnativeClient>
implements NamespacedKnativeClient, SupportTestingClient {
implements NamespacedKnativeClient {

public DefaultKnativeClient() {
super();
Expand Down Expand Up @@ -238,9 +237,4 @@ public MixedOperation<KafkaSource, KafkaSourceList, Resource<KafkaSource>> kafka
public MixedOperation<KafkaBinding, KafkaBindingList, Resource<KafkaBinding>> kafkaBindings() {
return resources(KafkaBinding.class, KafkaBindingList.class);
}

@Override
public boolean isSupported() {
return hasApiGroup("knative.dev", false);
}
}

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions extensions/open-cluster-management/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<artifactId>kubernetes-client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Loading
Loading