Skip to content

Commit af91076

Browse files
manusamanusa
authored
fix(openapi)!: buildable reference imports don't override local package class references
Signed-off-by: Marc Nuri <[email protected]>
1 parent ca2e1e9 commit af91076

File tree

767 files changed

+1325
-1743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

767 files changed

+1325
-1743
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### 7.4-SNAPSHOT
44

55
#### Bugs
6+
* Fix #7071: Buildable reference imports don't override local package class references
67

78
#### Improvements
89

‎extensions/certmanager/model/src/generated/java/io/fabric8/certmanager/api/model/meta/v1/LocalObjectReference.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.fabric8.kubernetes.api.model.KubernetesResource;
2020
import io.fabric8.kubernetes.api.model.LabelSelector;
2121
import io.fabric8.kubernetes.api.model.ObjectMeta;
22-
import io.fabric8.kubernetes.api.model.ObjectReference;
2322
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2423
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
2524
import io.fabric8.kubernetes.api.model.ResourceRequirements;
@@ -52,7 +51,7 @@
5251
@BuildableReference(PodTemplateSpec.class),
5352
@BuildableReference(ResourceRequirements.class),
5453
@BuildableReference(IntOrString.class),
55-
@BuildableReference(ObjectReference.class),
54+
@BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
5655
@BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class),
5756
@BuildableReference(PersistentVolumeClaim.class),
5857
@BuildableReference(EnvVar.class),

‎extensions/certmanager/model/src/generated/java/io/fabric8/certmanager/api/model/meta/v1/ObjectReference.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.fabric8.kubernetes.api.model.IntOrString;
1919
import io.fabric8.kubernetes.api.model.KubernetesResource;
2020
import io.fabric8.kubernetes.api.model.LabelSelector;
21-
import io.fabric8.kubernetes.api.model.LocalObjectReference;
2221
import io.fabric8.kubernetes.api.model.ObjectMeta;
2322
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2423
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -55,7 +54,7 @@
5554
@BuildableReference(ResourceRequirements.class),
5655
@BuildableReference(IntOrString.class),
5756
@BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
58-
@BuildableReference(LocalObjectReference.class),
57+
@BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class),
5958
@BuildableReference(PersistentVolumeClaim.class),
6059
@BuildableReference(EnvVar.class),
6160
@BuildableReference(ContainerPort.class),

‎extensions/certmanager/model/src/generated/java/io/fabric8/certmanager/api/model/meta/v1/SecretKeySelector.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import io.fabric8.kubernetes.api.model.IntOrString;
1919
import io.fabric8.kubernetes.api.model.KubernetesResource;
2020
import io.fabric8.kubernetes.api.model.LabelSelector;
21-
import io.fabric8.kubernetes.api.model.LocalObjectReference;
2221
import io.fabric8.kubernetes.api.model.ObjectMeta;
23-
import io.fabric8.kubernetes.api.model.ObjectReference;
2422
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2523
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
2624
import io.fabric8.kubernetes.api.model.ResourceRequirements;
@@ -54,8 +52,8 @@
5452
@BuildableReference(PodTemplateSpec.class),
5553
@BuildableReference(ResourceRequirements.class),
5654
@BuildableReference(IntOrString.class),
57-
@BuildableReference(ObjectReference.class),
58-
@BuildableReference(LocalObjectReference.class),
55+
@BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
56+
@BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class),
5957
@BuildableReference(PersistentVolumeClaim.class),
6058
@BuildableReference(EnvVar.class),
6159
@BuildableReference(ContainerPort.class),

‎extensions/istio/model/src/generated/java/io/fabric8/istio/api/api/extensions/v1alpha1/VmConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import io.fabric8.kubernetes.api.builder.Editable;
1717
import io.fabric8.kubernetes.api.model.Container;
1818
import io.fabric8.kubernetes.api.model.ContainerPort;
19-
import io.fabric8.kubernetes.api.model.EnvVar;
2019
import io.fabric8.kubernetes.api.model.IntOrString;
2120
import io.fabric8.kubernetes.api.model.KubernetesResource;
2221
import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -58,7 +57,7 @@
5857
@BuildableReference(ObjectReference.class),
5958
@BuildableReference(LocalObjectReference.class),
6059
@BuildableReference(PersistentVolumeClaim.class),
61-
@BuildableReference(EnvVar.class),
60+
@BuildableReference(io.fabric8.kubernetes.api.model.EnvVar.class),
6261
@BuildableReference(ContainerPort.class),
6362
@BuildableReference(Volume.class),
6463
@BuildableReference(VolumeMount.class)

‎extensions/istio/model/src/generated/java/io/fabric8/istio/api/api/extensions/v1alpha1/WasmPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.fabric8.kubernetes.api.builder.Editable;
1919
import io.fabric8.kubernetes.api.model.Container;
2020
import io.fabric8.kubernetes.api.model.ContainerPort;
21-
import io.fabric8.kubernetes.api.model.EnvVar;
2221
import io.fabric8.kubernetes.api.model.IntOrString;
2322
import io.fabric8.kubernetes.api.model.KubernetesResource;
2423
import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -80,7 +79,7 @@
8079
@BuildableReference(ObjectReference.class),
8180
@BuildableReference(LocalObjectReference.class),
8281
@BuildableReference(PersistentVolumeClaim.class),
83-
@BuildableReference(EnvVar.class),
82+
@BuildableReference(io.fabric8.kubernetes.api.model.EnvVar.class),
8483
@BuildableReference(ContainerPort.class),
8584
@BuildableReference(Volume.class),
8685
@BuildableReference(VolumeMount.class)

‎extensions/istio/model/src/generated/java/io/fabric8/istio/api/api/extensions/v1alpha1/WasmPluginTrafficSelector.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.fabric8.kubernetes.api.builder.Editable;
1818
import io.fabric8.kubernetes.api.model.Container;
1919
import io.fabric8.kubernetes.api.model.ContainerPort;
20-
import io.fabric8.kubernetes.api.model.EnvVar;
2120
import io.fabric8.kubernetes.api.model.IntOrString;
2221
import io.fabric8.kubernetes.api.model.KubernetesResource;
2322
import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -60,7 +59,7 @@
6059
@BuildableReference(ObjectReference.class),
6160
@BuildableReference(LocalObjectReference.class),
6261
@BuildableReference(PersistentVolumeClaim.class),
63-
@BuildableReference(EnvVar.class),
62+
@BuildableReference(io.fabric8.kubernetes.api.model.EnvVar.class),
6463
@BuildableReference(ContainerPort.class),
6564
@BuildableReference(Volume.class),
6665
@BuildableReference(VolumeMount.class)

‎kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/AllowedRoutes.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import io.fabric8.kubernetes.api.model.IntOrString;
2121
import io.fabric8.kubernetes.api.model.KubernetesResource;
2222
import io.fabric8.kubernetes.api.model.LabelSelector;
23-
import io.fabric8.kubernetes.api.model.LocalObjectReference;
2423
import io.fabric8.kubernetes.api.model.ObjectMeta;
25-
import io.fabric8.kubernetes.api.model.ObjectReference;
2624
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2725
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
2826
import io.fabric8.kubernetes.api.model.ResourceRequirements;
@@ -56,8 +54,8 @@
5654
@BuildableReference(PodTemplateSpec.class),
5755
@BuildableReference(ResourceRequirements.class),
5856
@BuildableReference(IntOrString.class),
59-
@BuildableReference(ObjectReference.class),
60-
@BuildableReference(LocalObjectReference.class),
57+
@BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
58+
@BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class),
6159
@BuildableReference(PersistentVolumeClaim.class),
6260
@BuildableReference(EnvVar.class),
6361
@BuildableReference(ContainerPort.class),

‎kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/BackendObjectReference.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import io.fabric8.kubernetes.api.model.IntOrString;
1919
import io.fabric8.kubernetes.api.model.KubernetesResource;
2020
import io.fabric8.kubernetes.api.model.LabelSelector;
21-
import io.fabric8.kubernetes.api.model.LocalObjectReference;
2221
import io.fabric8.kubernetes.api.model.ObjectMeta;
23-
import io.fabric8.kubernetes.api.model.ObjectReference;
2422
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2523
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
2624
import io.fabric8.kubernetes.api.model.ResourceRequirements;
@@ -57,8 +55,8 @@
5755
@BuildableReference(PodTemplateSpec.class),
5856
@BuildableReference(ResourceRequirements.class),
5957
@BuildableReference(IntOrString.class),
60-
@BuildableReference(ObjectReference.class),
61-
@BuildableReference(LocalObjectReference.class),
58+
@BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
59+
@BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class),
6260
@BuildableReference(PersistentVolumeClaim.class),
6361
@BuildableReference(EnvVar.class),
6462
@BuildableReference(ContainerPort.class),

‎kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/BackendRef.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import io.fabric8.kubernetes.api.model.IntOrString;
1919
import io.fabric8.kubernetes.api.model.KubernetesResource;
2020
import io.fabric8.kubernetes.api.model.LabelSelector;
21-
import io.fabric8.kubernetes.api.model.LocalObjectReference;
2221
import io.fabric8.kubernetes.api.model.ObjectMeta;
23-
import io.fabric8.kubernetes.api.model.ObjectReference;
2422
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2523
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
2624
import io.fabric8.kubernetes.api.model.ResourceRequirements;
@@ -58,8 +56,8 @@
5856
@BuildableReference(PodTemplateSpec.class),
5957
@BuildableReference(ResourceRequirements.class),
6058
@BuildableReference(IntOrString.class),
61-
@BuildableReference(ObjectReference.class),
62-
@BuildableReference(LocalObjectReference.class),
59+
@BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
60+
@BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class),
6361
@BuildableReference(PersistentVolumeClaim.class),
6462
@BuildableReference(EnvVar.class),
6563
@BuildableReference(ContainerPort.class),

0 commit comments

Comments
 (0)