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.
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
✨ crd/gen: sort FindKubeKinds #679
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
pkg/crd/testdata/gen/zoo/bar.example.com_zooes.v1beta1.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
--- | ||
apiVersion: apiextensions.k8s.io/v1beta1 | ||
kind: CustomResourceDefinition | ||
metadata: | ||
annotations: | ||
controller-gen.kubebuilder.io/version: (devel) | ||
creationTimestamp: null | ||
name: zoos.bar.example.com | ||
spec: | ||
group: bar.example.com | ||
names: | ||
kind: Zoo | ||
listKind: ZooList | ||
plural: zooes | ||
singular: zoo | ||
scope: Namespaced | ||
validation: | ||
openAPIV3Schema: | ||
properties: | ||
apiVersion: | ||
description: 'APIVersion defines the versioned schema of this representation | ||
of an object. Servers should convert recognized schemas to the latest | ||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
type: string | ||
kind: | ||
description: 'Kind is a string value representing the REST resource this | ||
object represents. Servers may infer this from the endpoint the client | ||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
type: string | ||
metadata: | ||
type: object | ||
spec: | ||
description: Spec comments SHOULD appear in the CRD spec | ||
properties: | ||
defaultedString: | ||
description: This tests that defaulted fields are stripped for v1beta1, | ||
but not for v1 | ||
type: string | ||
required: | ||
- defaultedString | ||
type: object | ||
status: | ||
description: Status comments SHOULD appear in the CRD spec | ||
type: object | ||
type: object | ||
version: zoo | ||
versions: | ||
- name: zoo | ||
served: true | ||
storage: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
--- | ||
apiVersion: apiextensions.k8s.io/v1 | ||
kind: CustomResourceDefinition | ||
metadata: | ||
annotations: | ||
controller-gen.kubebuilder.io/version: (devel) | ||
creationTimestamp: null | ||
name: zooes.bar.example.com | ||
spec: | ||
group: bar.example.com | ||
names: | ||
kind: Zoo | ||
listKind: ZooList | ||
plural: zooes | ||
singular: zoo | ||
scope: Namespaced | ||
versions: | ||
- name: zoo | ||
schema: | ||
openAPIV3Schema: | ||
properties: | ||
apiVersion: | ||
description: 'APIVersion defines the versioned schema of this representation | ||
of an object. Servers should convert recognized schemas to the latest | ||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
type: string | ||
kind: | ||
description: 'Kind is a string value representing the REST resource this | ||
object represents. Servers may infer this from the endpoint the client | ||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
type: string | ||
metadata: | ||
type: object | ||
spec: | ||
description: Spec comments SHOULD appear in the CRD spec | ||
properties: | ||
defaultedString: | ||
default: zooDefaultString | ||
description: This tests that defaulted fields are stripped for v1beta1, | ||
but not for v1 | ||
type: string | ||
required: | ||
- defaultedString | ||
type: object | ||
status: | ||
description: Status comments SHOULD appear in the CRD spec | ||
type: object | ||
type: object | ||
served: true | ||
storage: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
//go:generate ../../../../.run-controller-gen.sh crd:crdVersions=v1beta1 paths=. output:dir=. | ||
//go:generate mv bar.example.com_zooes.yaml bar.example.com_zooes.v1beta1.yaml | ||
//go:generate ../../../../.run-controller-gen.sh crd:crdVersions=v1 paths=. output:dir=. | ||
|
||
// +groupName=bar.example.com | ||
package zoo | ||
|
||
import ( | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
) | ||
|
||
type ZooSpec struct { | ||
// This tests that defaulted fields are stripped for v1beta1, | ||
// but not for v1 | ||
// +kubebuilder:default=zooDefaultString | ||
DefaultedString string `json:"defaultedString"` | ||
} | ||
type ZooStatus struct{} | ||
|
||
type Zoo struct { | ||
// TypeMeta comments should NOT appear in the CRD spec | ||
metav1.TypeMeta `json:",inline"` | ||
// ObjectMeta comments should NOT appear in the CRD spec | ||
metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
||
// Spec comments SHOULD appear in the CRD spec | ||
Spec ZooSpec `json:"spec,omitempty"` | ||
// Status comments SHOULD appear in the CRD spec | ||
Status ZooStatus `json:"status,omitempty"` | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gshirazi I can't comment on it, but you checked in a binary
cmd/main
. Please remove that, other than that the change looks good to me./hold
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done.