remove io.fabric8.kubernetes.model.annotation.PrinterColumn

fabric8io · Sep 6, 2023 · afe0838 · afe0838
1 parent 7b916b5
commit afe0838
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 #### New Features
 
 #### _**Note**_: Breaking changes
+* Fix #5343: Removed `io.fabric8.kubernetes.model.annotation.PrinterColumn`, use `io.fabric8.crd.generator.annotation.PrinterColumn`
 * Fix #5368: ListOptions parameter ordering is now alphabetical.  If you are using non-crud mocking for lists with options, you may need to update your parameter order.
 * Fix #5391: Removed the vertx-uri-template dependency from the vertx client, if you need that for your application, then introduce your own dependency.
 

diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/example/joke/JokeRequestSpec.java b/crd-generator/api/src/test/java/io/fabric8/crd/example/joke/JokeRequestSpec.java
@@ -42,7 +42,7 @@ public enum ExcludedTopic {
   @PrinterColumn(name = "jokeCategory", priority = 1)
   @JsonPropertyDescription("category-description")
   private Category category = Category.Any;
-  @io.fabric8.kubernetes.model.annotation.PrinterColumn(name = "excludedTopics")
+  @PrinterColumn(name = "excludedTopics")
   private ExcludedTopic[] excluded = new ExcludedTopic[] { ExcludedTopic.nsfw, ExcludedTopic.racist,
       ExcludedTopic.sexist };
   private boolean safe;

diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/example/joke/JokeRequestStatus.java b/crd-generator/api/src/test/java/io/fabric8/crd/example/joke/JokeRequestStatus.java
@@ -15,7 +15,7 @@
  */
 package io.fabric8.crd.example.joke;
 
-import io.fabric8.kubernetes.model.annotation.PrinterColumn;
+import io.fabric8.crd.generator.annotation.PrinterColumn;
 
 public class JokeRequestStatus {
   public enum State {

diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/zookeeper/v1/ZookeeperStatus.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/zookeeper/v1/ZookeeperStatus.java
@@ -15,8 +15,8 @@
  */
 package io.fabric8.crd.generator.zookeeper.v1;
 
+import io.fabric8.crd.generator.annotation.PrinterColumn;
 import io.fabric8.kubernetes.model.annotation.LabelSelector;
-import io.fabric8.kubernetes.model.annotation.PrinterColumn;
 import io.fabric8.kubernetes.model.annotation.StatusReplicas;
 
 import java.util.Map;

diff --git a/...etes-model-common/src/main/java/io/fabric8/kubernetes/model/annotation/PrinterColumn.java b/...etes-model-common/src/main/java/io/fabric8/kubernetes/model/annotation/PrinterColumn.java