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: deprecate service catalog extension #6006

Merged
merged 1 commit into from
May 14, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* Fix #5960: The KubernetesSerializer will now by default serialize time related types to strings - rather than object, integer, number, or arrays of integer / number. If you are using these types in a custom object and were not including JsonFormat annotations to adjust the serialization they were likely being serialized in a non-standard way that would not be usable other Kubernetes clients, nor match the generated custom resource definition if one was being produced. Please open an issue if you need the previous behavior for whatever reason - there is a workaround by creating a customized KubernetesSerializer.
* `storagemigration.k8s.io/v1alpha1` `StorageVersionMigration` introduced in Kubernetes 1.30.0 is added to [kubernetes-model-storageclass](https://github.com/fabric8io/kubernetes-client/tree/main/kubernetes-model-generator/kubernetes-model-storageclass) module. A dedicated module hasn't been created for this new ApiGroup.
* Fix #5947: CRD generation using the v1beta1 version is deprecated. Please use only v1 instead.
* Fix #6006: Service Catalog extension is deprecated following its deperecation in Kubernetes.

### 6.12.1 (2024-04-18)

Expand Down
4 changes: 2 additions & 2 deletions extensions/service-catalog/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<artifactId>servicecatalog-client</artifactId>
<packaging>bundle</packaging>
<name>Fabric8 :: Service Catalog :: Client</name>
<name>Fabric8 :: Service Catalog :: Client (Deprecated)</name>

<properties>
<useIncrementalCompilation>false</useIncrementalCompilation>
Expand Down Expand Up @@ -57,7 +57,7 @@
<groupId>io.fabric8</groupId>
<artifactId>servicecatalog-model</artifactId>
</dependency>

<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
import io.fabric8.servicecatalog.client.dsl.ServiceBindingResource;
import io.fabric8.servicecatalog.client.dsl.ServiceInstanceResource;

/**
* @deprecated This extension is deprecated and will be removed in a future release.
*/
@Deprecated
public class DefaultServiceCatalogClient extends ExtensionRootClientAdapter<DefaultServiceCatalogClient>
implements NamespacedServiceCatalogClient, SupportTestingClient {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
import io.fabric8.kubernetes.client.dsl.Namespaceable;
import io.fabric8.kubernetes.client.dsl.RequestConfigurable;

/**
* @deprecated This extension is deprecated and will be removed in a future release.
*/
@Deprecated
public interface GenericServiceCatalogClient<C extends Client> extends Client, ServiceCatalogClient,
Namespaceable<C>,
AnyNamespaceable<C>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
*/
package io.fabric8.servicecatalog.client;

/**
* @deprecated This extension is deprecated and will be removed in a future release.
*/
@Deprecated
public interface NamespacedServiceCatalogClient extends ServiceCatalogClient,
GenericServiceCatalogClient<NamespacedServiceCatalogClient> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@

/**
* Main interface for Service Catalog Client.
*
* @deprecated This extension is deprecated and will be removed in a future release.
*/
@Deprecated
public interface ServiceCatalogClient extends Client {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
import io.fabric8.servicecatalog.client.internal.ServiceBindingOperationsImpl;
import io.fabric8.servicecatalog.client.internal.ServiceInstanceOperationsImpl;

/**
* @deprecated This extension is deprecated and will be removed in a future release.
*/
@Deprecated
public class ServiceCatalogExtensionAdapter implements ExtensionAdapter<ServiceCatalogClient> {

@Override
Expand Down
4 changes: 2 additions & 2 deletions extensions/service-catalog/model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<artifactId>servicecatalog-model</artifactId>
<packaging>bundle</packaging>
<name>Fabric8 :: Service Catalog :: Model</name>
<name>Fabric8 :: Service Catalog :: Model (Deprecated)</name>

<properties>
<osgi.import>
Expand Down Expand Up @@ -67,7 +67,7 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>generate</id>
Expand Down
Loading