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(openapi): remove no longer needed openshift-cluster-network-operator.json #6403

Merged
merged 1 commit into from
Oct 2, 2024
Merged

refactor(openapi): remove no longer needed openshift-cluster-network-operator.json #6403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions kubernetes-model-generator/openapi/generator/cmd/reflection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package main

import (
"github.com/getkin/kin-openapi/openapi3"
openshiftclusternetworkoperatorv1 "github.com/openshift/cluster-network-operator/pkg/apis/network/v1"
"github.com/spf13/cobra"
admissionV1 "k8s.io/api/admission/v1"
admissionV1Beta1 "k8s.io/api/admission/v1beta1"
Expand Down Expand Up @@ -118,11 +117,6 @@ var reflectionRun = func(cmd *cobra.Command, args []string) {
reflect.TypeOf(metricsV1Beta1.PodMetricsList{}): {true, metricsV1Beta1.SchemeGroupVersion.String(), "pods", true},
reflect.TypeOf(metricsV1Beta1.PodMetrics{}): {false, metricsV1Beta1.SchemeGroupVersion.String(), "pods", true},
}, "metrics"),
// OperatorPKI specs are not included in OpenApi
NewPathSchema(map[reflect.Type]ApiVersion{
reflect.TypeOf(openshiftclusternetworkoperatorv1.OperatorPKIList{}): {true, openshiftclusternetworkoperatorv1.GroupVersion.String(), "operatorpkis", true},
reflect.TypeOf(openshiftclusternetworkoperatorv1.OperatorPKI{}): {false, openshiftclusternetworkoperatorv1.GroupVersion.String(), "operatorpkis", true},
}, "openshift-cluster-network-operator"),
}
generate(schemas, targetDirectory)
}
Expand Down
1 change: 0 additions & 1 deletion kubernetes-model-generator/openapi/schemas/openshift-cluster-network-operator.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions kubernetes-model-generator/openshift-model-operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,9 @@
<settings combine.self="append">
<schemas>
<schema>${openapi.schema.openshift-generated}</schema>
<schema>${project.basedir}/../openapi/schemas/openshift-cluster-network-operator.json</schema>
</schemas>
<packageMappings combine.self="append">
<com.github.openshift.cluster-network-operator.pkg.apis.network>io.fabric8.openshift.api.model.operator.network</com.github.openshift.cluster-network-operator.pkg.apis.network>
</packageMappings>
<includeGenerationRegexes>
<includeGenerationRegex>^io\.openshift\.operator\..*$</includeGenerationRegex>
<includeGenerationRegex>^com\.github\.openshift\.cluster-network-operator\..*$</includeGenerationRegex>
</includeGenerationRegexes>
<skipGenerationRegexes>
<skipGenerationRegex>^io\.openshift\.operator\.samples\..*$</skipGenerationRegex>
Expand Down
Loading