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.

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

Fix domain resource issues in controller #54

Merged
merged 1 commit into from
Aug 3, 2018

Conversation

fanzhangio
Copy link

bind resource for controller based on whether resource is created.

  1. If resource is created in project, bind with created resource.
  2. If resource not created, gkv matches core types, bind with core-types.
  3. Else, using specified resourcePath by flag --resource-pkg-path (TODO)

Fix issues:
kubernetes-sigs/kubebuilder#342
kubernetes-sigs/kubebuilder#335
kubernetes-sigs/kubebuilder#338

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 2, 2018
}
a.ResourcePackage = path.Join(a.Repo, "pkg", "apis")
a.GroupDomain = a.Resource.Group + "." + a.Domain
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can capture this logic in a separate function so that it can be called by both Test/Controller methods ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

}
a.ResourcePackage = path.Join(a.Repo, "pkg", "apis")
}

var controllerTestTemplate = `{{ .Boilerplate }}

package {{ lower .Resource.Kind }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add two tests by modifying the generate_golden.sh by creating controller for existing type under pkg/apis which matches the group with core and second one with controller-only for core resource.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Added to test.

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 2, 2018
- bind resource for controller based on whether resource is created.
  1) If resource is created in project, bind with created resource.
  2) If resource not created, gkv matches core types, bind with core-types.
  3) Else, using specified resourcePath by flag --resource-pkg-path (TODO)
- change test domain from k8s.io to testproject.org
@droot droot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Aug 3, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: fanzhangio

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit ade554d into kubernetes-sigs:master Aug 3, 2018
@fanzhangio fanzhangio deleted the fix-domain branch August 6, 2018 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants