Skip to content

Commit

Permalink
Revert ":bug: use map in FindKubeKinds"
Browse files Browse the repository at this point in the history
This reverts commit 81d0342.
  • Loading branch information
gshirazi committed Jun 6, 2022
1 parent be64fdb commit 566781a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions pkg/crd/gen.go
Expand Up @@ -127,7 +127,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
crdVersions = []string{defaultVersion}
}

for groupKind := range kubeKinds {
for _, groupKind := range kubeKinds {
parser.NeedCRDFor(groupKind, g.MaxDescLen)
crdRaw := parser.CustomResourceDefinitions[groupKind]
addAttribution(&crdRaw)
Expand Down Expand Up @@ -216,9 +216,9 @@ func FindMetav1(roots []*loader.Package) *loader.Package {
// FindKubeKinds locates all types that contain TypeMeta and ObjectMeta
// (and thus may be a Kubernetes object), and returns the corresponding
// group-kinds.
func FindKubeKinds(parser *Parser, metav1Pkg *loader.Package) map[schema.GroupKind]struct{} {
func FindKubeKinds(parser *Parser, metav1Pkg *loader.Package) []schema.GroupKind {
// TODO(directxman12): technically, we should be finding metav1 per-package
kubeKinds := map[schema.GroupKind]struct{}{}
var kubeKinds []schema.GroupKind
for typeIdent, info := range parser.Types {
hasObjectMeta := false
hasTypeMeta := false
Expand Down Expand Up @@ -272,7 +272,7 @@ func FindKubeKinds(parser *Parser, metav1Pkg *loader.Package) map[schema.GroupKi
Group: parser.GroupVersions[pkg].Group,
Kind: typeIdent.Name,
}
kubeKinds[groupKind] = struct{}{}
kubeKinds = append(kubeKinds, groupKind)
}

return kubeKinds
Expand Down
2 changes: 1 addition & 1 deletion pkg/schemapatcher/gen.go
Expand Up @@ -113,7 +113,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) (result error) {
}

// generate schemata for the types we care about, and save them to be written later.
for groupKind := range crdgen.FindKubeKinds(parser, metav1Pkg) {
for _, groupKind := range crdgen.FindKubeKinds(parser, metav1Pkg) {
existingSet, wanted := partialCRDSets[groupKind]
if !wanted {
continue
Expand Down

0 comments on commit 566781a

Please sign in to comment.