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.

Sign up for GitHub

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

refactor: kubernetes-model-apiextensions generated from OpenAPI schemas #6191

Merged
merged 4 commits into from
Jul 24, 2024
Merged

refactor: kubernetes-model-apiextensions generated from OpenAPI schemas #6191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dac31c0
fix(openapi): apiextensions with path info
manusa Jul 24, 2024
e0fc424
fix(openapi): remove unneeded v1beta1 ConversionXxx definitions for a…
manusa Jul 24, 2024
7beecb0
fix(openapi): additionalProperties not added if field with same name …
manusa Jul 24, 2024
74441d4
refactor: kubernetes-model-apiextensions generated from OpenAPI schemas
manusa Jul 24, 2024
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ generate-openapi-classes:
cd kubernetes-model-generator/kubernetes-model-core && mvn -Pgenerate clean install
cd kubernetes-model-generator/kubernetes-model-rbac && mvn -Pgenerate clean install
cd kubernetes-model-generator/kubernetes-model-admissionregistration && mvn -Pgenerate clean install
cd kubernetes-model-generator/kubernetes-model-apiextensions && mvn -Pgenerate clean install

# Legacy generation of the model: TODO: remove
.PHONY: generate-model-legacy
Expand Down
1 change: 0 additions & 1 deletion kubernetes-model-generator/generateModel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR")

# Array for all existing modules
declare -a modules=(
"kubernetes-model-apiextensions"
"kubernetes-model-apps"
"kubernetes-model-autoscaling"
"kubernetes-model-batch"
Expand Down
27 changes: 0 additions & 27 deletions kubernetes-model-generator/kubernetes-model-apiextensions/Makefile
View file
Open in desktop

This file was deleted.

163 changes: 0 additions & 163 deletions kubernetes-model-generator/kubernetes-model-apiextensions/cmd/generate/generate.go
View file
Open in desktop

This file was deleted.

40 changes: 21 additions & 19 deletions kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,33 @@
</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.21.14.json</schema>
<schema>${openapi.schema.kubernetes-latest}</schema>
<schema>${project.basedir}/../openapi/schemas/apiextensions.json</schema>
</schemas>
<packageMappings combine.self="append">
<io.k8s.apiextensions-apiserver.pkg.apis>io.fabric8.kubernetes.api.model</io.k8s.apiextensions-apiserver.pkg.apis>
</packageMappings>
<skipGenerationRegexes>
<skipGenerationRegex>^io\.k8s\.apiextensions-apiserver\.pkg\.apis\.apiextensions\.v1beta1\.JSON$</skipGenerationRegex>
<skipGenerationRegex>^io\.k8s\.apiextensions-apiserver\.pkg\.apis\.apiextensions\.v1\.JSON$</skipGenerationRegex>
</skipGenerationRegexes>
<includeGenerationRegexes>
<includeGenerationRegex>^io\.k8s\.apiextensions-apiserver\..*$</includeGenerationRegex>
</includeGenerationRegexes>
</settings>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Loading
Loading