fix: deprecate service catalog extension

Signed-off-by: Marc Nuri <marc@marcnuri.com>
fabric8io · May 14, 2024 · e97a19e · e97a19e
1 parent f999324
commit e97a19e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 

diff --git a/extensions/service-catalog/client/pom.xml b/extensions/service-catalog/client/pom.xml
@@ -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>
@@ -57,7 +57,7 @@
       <groupId>io.fabric8</groupId>
       <artifactId>servicecatalog-model</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>

diff --git a/...og/client/src/main/java/io/fabric8/servicecatalog/client/DefaultServiceCatalogClient.java b/...og/client/src/main/java/io/fabric8/servicecatalog/client/DefaultServiceCatalogClient.java
@@ -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 {
 

diff --git a/...og/client/src/main/java/io/fabric8/servicecatalog/client/GenericServiceCatalogClient.java b/...og/client/src/main/java/io/fabric8/servicecatalog/client/GenericServiceCatalogClient.java
@@ -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>,

diff --git a/...client/src/main/java/io/fabric8/servicecatalog/client/NamespacedServiceCatalogClient.java b/...client/src/main/java/io/fabric8/servicecatalog/client/NamespacedServiceCatalogClient.java
@@ -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> {
 }
diff --git a/...e-catalog/client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogClient.java b/...e-catalog/client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogClient.java
@@ -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 {
 
   /**

diff --git a/...client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogExtensionAdapter.java b/...client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogExtensionAdapter.java
@@ -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

diff --git a/extensions/service-catalog/model/pom.xml b/extensions/service-catalog/model/pom.xml
@@ -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>
@@ -67,7 +67,7 @@
       <artifactId>lombok</artifactId>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>generate</id>