Skip to content

Commit d84c87e

Browse files
authored
Merge pull request #1856 from chappjc/jon/ssa-fix
implement OpenAPIModelName to fix SSA of data.packaging.carvel.dev types
2 parents 5ce6525 + 820315c commit d84c87e

4 files changed

Lines changed: 91 additions & 27 deletions

File tree

hack/gen-apiserver.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go \
7171
--output-pkg "${KC_PKG}/pkg/apiserver/openapi" \
7272
--output-dir "pkg/apiserver/openapi" \
7373
--output-file zz_generated.openapi.go \
74+
--output-model-name-file zz_generated.model_name.go \
7475
--go-header-file hack/gen-boilerplate.txt
7576

7677
# Install protoc binary as directed by https://github.com/gogo/protobuf#installation

pkg/apiserver/apis/datapackaging/v1alpha1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
// +k8s:openapi-gen=true
5+
// +k8s:openapi-model-package=dev.carvel.kapp-controller.pkg.apiserver.apis.datapackaging.v1alpha1
56
// +k8s:deepcopy-gen=package
67
// +k8s:conversion-gen=carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging
78
// +k8s:defaulter-gen=TypeMeta

pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.model_name.go

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apiserver/openapi/zz_generated.openapi.go

Lines changed: 28 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)