refactor: kubernetes-model-rbac generated from OpenAPI schemas

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Jul 23, 2024 · 82f8406 · 82f8406
1 parent a1db513
commit 82f8406
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 157 deletions.
diff --git a/Makefile b/Makefile
@@ -35,6 +35,7 @@ generate-openapi-classes:
 	cd kubernetes-model-generator/kubernetes-model-common && mvn clean install
 	cd kubernetes-model-generator/openapi/maven-plugin && mvn clean verify
 	cd kubernetes-model-generator/kubernetes-model-core && mvn -Pgenerate clean install
+	cd kubernetes-model-generator/kubernetes-model-rbac && mvn -Pgenerate clean install
 
 # Legacy generation of the model: TODO: remove
 .PHONY: generate-model-legacy

diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh
@@ -22,7 +22,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR")
 
 # Array for all existing modules
 declare -a modules=(
-    "kubernetes-model-rbac"
     "kubernetes-model-admissionregistration"
     "kubernetes-model-apiextensions"
     "kubernetes-model-apps"

diff --git a/kubernetes-model-generator/kubernetes-model-rbac/Makefile b/kubernetes-model-generator/kubernetes-model-rbac/Makefile
diff --git a/kubernetes-model-generator/kubernetes-model-rbac/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-rbac/cmd/generate/generate.go
diff --git a/kubernetes-model-generator/kubernetes-model-rbac/pom.xml b/kubernetes-model-generator/kubernetes-model-rbac/pom.xml
@@ -49,31 +49,27 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <configuration>
-              <skipAttach>false</skipAttach>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
     <profile>
       <id>generate</id>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.jsonschema2pojo</groupId>
-            <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openapi-model-generator-maven-plugin</artifactId>
+            <configuration >
+              <settings combine.self="append">
+                <schemas>
+                  <schema>${project.basedir}/../openapi/schemas/kubernetes-1.30.0.json</schema>
+                </schemas>
+                <packageMappings combine.self="append">
+                  <io.k8s.api.rbac.v1>io.fabric8.kubernetes.api.model.rbac</io.k8s.api.rbac.v1>
+                </packageMappings>
+                <includeGenerationRegexes>
+                  <includeGenerationRegex>^io\.k8s\.api\.rbac\..*$</includeGenerationRegex>
+                </includeGenerationRegexes>
+              </settings>
+            </configuration>
           </plugin>
         </plugins>
       </build>

diff --git a/...s-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/AggregationRule.java b/...s-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/AggregationRule.java
@@ -17,6 +17,7 @@
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
@@ -42,7 +43,7 @@
 })
 @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
     @BuildableReference(ObjectMeta.class),
-    @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class),
+    @BuildableReference(LabelSelector.class),
     @BuildableReference(Container.class),
     @BuildableReference(PodTemplateSpec.class),
     @BuildableReference(ResourceRequirements.class),
@@ -57,7 +58,7 @@ public class AggregationRule implements Editable<AggregationRuleBuilder> , Kuber
 
     @JsonProperty("clusterRoleSelectors")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<io.fabric8.kubernetes.api.model.LabelSelector> clusterRoleSelectors = new ArrayList<>();
+    private List<LabelSelector> clusterRoleSelectors = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -68,19 +69,19 @@ public class AggregationRule implements Editable<AggregationRuleBuilder> , Kuber
     public AggregationRule() {
     }
 
-    public AggregationRule(List<io.fabric8.kubernetes.api.model.LabelSelector> clusterRoleSelectors) {
+    public AggregationRule(List<LabelSelector> clusterRoleSelectors) {
         super();
         this.clusterRoleSelectors = clusterRoleSelectors;
     }
 
     @JsonProperty("clusterRoleSelectors")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<io.fabric8.kubernetes.api.model.LabelSelector> getClusterRoleSelectors() {
+    public List<LabelSelector> getClusterRoleSelectors() {
         return clusterRoleSelectors;
     }
 
     @JsonProperty("clusterRoleSelectors")
-    public void setClusterRoleSelectors(List<io.fabric8.kubernetes.api.model.LabelSelector> clusterRoleSelectors) {
+    public void setClusterRoleSelectors(List<LabelSelector> clusterRoleSelectors) {
         this.clusterRoleSelectors = clusterRoleSelectors;
     }
 

diff --git a/...netes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java b/...netes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java
@@ -19,6 +19,7 @@
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -49,7 +50,7 @@
     ""
 })
 @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+    @BuildableReference(ObjectMeta.class),
     @BuildableReference(LabelSelector.class),
     @BuildableReference(Container.class),
     @BuildableReference(PodTemplateSpec.class),
@@ -85,7 +86,7 @@ public class ClusterRole implements Editable<ClusterRoleBuilder> , HasMetadata
     @JsonProperty("kind")
     private String kind = "ClusterRole";
     @JsonProperty("metadata")
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+    private ObjectMeta metadata;
     @JsonProperty("rules")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<PolicyRule> rules = new ArrayList<>();
@@ -99,7 +100,7 @@ public class ClusterRole implements Editable<ClusterRoleBuilder> , HasMetadata
     public ClusterRole() {
     }
 
-    public ClusterRole(AggregationRule aggregationRule, String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List<PolicyRule> rules) {
+    public ClusterRole(AggregationRule aggregationRule, String apiVersion, String kind, ObjectMeta metadata, List<PolicyRule> rules) {
         super();
         this.aggregationRule = aggregationRule;
         this.apiVersion = apiVersion;
@@ -159,12 +160,12 @@ public void setKind(String kind) {
     }
 
     @JsonProperty("metadata")
-    public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+    public ObjectMeta getMetadata() {
         return metadata;
     }
 
     @JsonProperty("metadata")
-    public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+    public void setMetadata(ObjectMeta metadata) {
         this.metadata = metadata;
     }
 

diff --git a/...odel-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java b/...odel-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java
@@ -19,6 +19,7 @@
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -49,7 +50,7 @@
     ""
 })
 @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+    @BuildableReference(ObjectMeta.class),
     @BuildableReference(LabelSelector.class),
     @BuildableReference(Container.class),
     @BuildableReference(PodTemplateSpec.class),
@@ -83,7 +84,7 @@ public class ClusterRoleBinding implements Editable<ClusterRoleBindingBuilder> ,
     @JsonProperty("kind")
     private String kind = "ClusterRoleBinding";
     @JsonProperty("metadata")
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+    private ObjectMeta metadata;
     @JsonProperty("roleRef")
     private RoleRef roleRef;
     @JsonProperty("subjects")
@@ -99,7 +100,7 @@ public class ClusterRoleBinding implements Editable<ClusterRoleBindingBuilder> ,
     public ClusterRoleBinding() {
     }
 
-    public ClusterRoleBinding(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, RoleRef roleRef, List<Subject> subjects) {
+    public ClusterRoleBinding(String apiVersion, String kind, ObjectMeta metadata, RoleRef roleRef, List<Subject> subjects) {
         super();
         this.apiVersion = apiVersion;
         this.kind = kind;
@@ -149,12 +150,12 @@ public void setKind(String kind) {
     }
 
     @JsonProperty("metadata")
-    public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+    public ObjectMeta getMetadata() {
         return metadata;
     }
 
     @JsonProperty("metadata")
-    public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+    public void setMetadata(ObjectMeta metadata) {
         this.metadata = metadata;
     }
 

diff --git a/...r/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java b/...r/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java
@@ -20,6 +20,7 @@
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -49,7 +50,7 @@
     ""
 })
 @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+    @BuildableReference(ObjectMeta.class),
     @BuildableReference(LabelSelector.class),
     @BuildableReference(Container.class),
     @BuildableReference(PodTemplateSpec.class),
@@ -83,7 +84,7 @@ public class Role implements Editable<RoleBuilder> , HasMetadata, Namespaced
     @JsonProperty("kind")
     private String kind = "Role";
     @JsonProperty("metadata")
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+    private ObjectMeta metadata;
     @JsonProperty("rules")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<PolicyRule> rules = new ArrayList<>();
@@ -97,7 +98,7 @@ public class Role implements Editable<RoleBuilder> , HasMetadata, Namespaced
     public Role() {
     }
 
-    public Role(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List<PolicyRule> rules) {
+    public Role(String apiVersion, String kind, ObjectMeta metadata, List<PolicyRule> rules) {
         super();
         this.apiVersion = apiVersion;
         this.kind = kind;
@@ -146,12 +147,12 @@ public void setKind(String kind) {
     }
 
     @JsonProperty("metadata")
-    public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+    public ObjectMeta getMetadata() {
         return metadata;
     }
 
     @JsonProperty("metadata")
-    public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+    public void setMetadata(ObjectMeta metadata) {
         this.metadata = metadata;
     }